Migrates some 'm365group' commands to zod. Closes #6849#6845
Draft
martinlingstuyl wants to merge 1 commit intopnp:mainfrom
Draft
Migrates some 'm365group' commands to zod. Closes #6849#6845martinlingstuyl wants to merge 1 commit intopnp:mainfrom
martinlingstuyl wants to merge 1 commit intopnp:mainfrom
Conversation
martinlingstuyl
force-pushed
the
zod-m365group-commands
branch
3 times, most recently
from
2ef5579 to
f74716f
Compare
martinlingstuyl
changed the title
martinlingstuyl
force-pushed
the
zod-m365group-commands
branch
3 times, most recently
from
914a578 to
880aec0
Compare
Contributor
|
Hi @martinlingstuyl, could you please check and resolve conflicts? |
martinlingstuyl
force-pushed
the
zod-m365group-commands
branch
from
880aec0 to
54b6017
Compare
MartinM85
requested changes
Dec 6, 2025
Contributor
MartinM85
left a comment
MartinM85
left a comment
There was a problem hiding this comment.
Amazing work @martinlingstuyl . Just a few minor suggestions from my side.
In some commands you have replaced single quotes with double quotes for import, sinon.stub and test names. I think we prefer single quotes in this case. I would suggest reverting these changes.
| const options = globalOptionsZod | ||
| .extend({ | ||
| ids: zod.alias('ids', z.string().optional()), | ||
| userNames: zod.alias('userNames', z.string().optional()), |
Contributor
There was a problem hiding this comment.
Suggested change
| userNames: zod.alias('userNames', z.string().optional()), | |
| userNames: z.string().optional(), |
Comment on lines
+18
to
+20
| groupName: zod.alias('groupName', z.string().optional()), | ||
| teamId: zod.alias('teamId', z.string().uuid().optional()), | ||
| teamName: zod.alias('teamName', z.string().optional()), |
Contributor
There was a problem hiding this comment.
Suggested change
| groupName: zod.alias('groupName', z.string().optional()), | |
| teamId: zod.alias('teamId', z.string().uuid().optional()), | |
| teamName: zod.alias('teamName', z.string().optional()), | |
| groupName: z.string().optional(), | |
| teamId: z.string().uuid().optional(), | |
| teamName: z.string().optional(), |
| } | ||
|
|
||
| class EntraM365GroupUserAddCommand extends GraphCommand { | ||
| private readonly allowedRoles: string[] = ['owner', 'member']; |
Contributor
There was a problem hiding this comment.
Could you replace the allowedRoles with an enum similar to the GroupVisibility used in the m365 group add command?
Then we can omit the allowedRoles from refining in the getRefinedSchema and define the role option as zod.coercedEnum()
| groupId: zod.alias('i', z.string().uuid().optional()), | ||
| groupDisplayName: zod.alias('d', z.string().optional()), | ||
| properties: zod.alias('p', z.string().optional()), | ||
| role: zod.alias('r', z.string().optional()) |
Contributor
There was a problem hiding this comment.
Let's use enum for the role option.
Comment on lines
+17
to
+18
| teamId: zod.alias('teamId', z.string().uuid().optional()), | ||
| teamName: zod.alias('teamName', z.string().optional()), |
Contributor
There was a problem hiding this comment.
Suggested change
| teamId: zod.alias('teamId', z.string().uuid().optional()), | |
| teamName: zod.alias('teamName', z.string().optional()), | |
| teamId: z.string().uuid().optional(), | |
| teamName: z.string().optional(), |
Comment on lines
+16
to
+21
| ids: zod.alias('ids', z.string().optional()), | ||
| userNames: zod.alias('userNames', z.string().optional()), | ||
| groupId: zod.alias('i', z.string().uuid().optional()), | ||
| groupName: zod.alias('groupName', z.string().optional()), | ||
| teamId: zod.alias('teamId', z.string().uuid().optional()), | ||
| teamName: zod.alias('teamName', z.string().optional()), |
Contributor
There was a problem hiding this comment.
Suggested change
| ids: zod.alias('ids', z.string().optional()), | |
| userNames: zod.alias('userNames', z.string().optional()), | |
| groupId: zod.alias('i', z.string().uuid().optional()), | |
| groupName: zod.alias('groupName', z.string().optional()), | |
| teamId: zod.alias('teamId', z.string().uuid().optional()), | |
| teamName: zod.alias('teamName', z.string().optional()), | |
| ids: z.string().optional(), | |
| userNames: z.string().optional(), | |
| groupId: zod.alias('i', z.string().uuid().optional()), | |
| groupName: z.string().optional(), | |
| teamId: z.string().uuid().optional(), | |
| teamName: z.string().optional(), |
| groupName: zod.alias('groupName', z.string().optional()), | ||
| teamId: zod.alias('teamId', z.string().uuid().optional()), | ||
| teamName: zod.alias('teamName', z.string().optional()), | ||
| role: zod.alias('r', z.string()) |
Contributor
There was a problem hiding this comment.
Let's use the enum for the role.
Comment on lines
+23
to
+36
| id: zod.alias('i', z.string().uuid().optional()), | ||
| displayName: zod.alias('n', z.string().optional()), | ||
| newDisplayName: zod.alias('newDisplayName', z.string().optional()), | ||
| description: zod.alias('d', z.string().optional()), | ||
| ownerIds: zod.alias('ownerIds', z.string().optional()), | ||
| ownerUserNames: zod.alias('ownerUserNames', z.string().optional()), | ||
| memberIds: zod.alias('memberIds', z.string().optional()), | ||
| memberUserNames: zod.alias('memberUserNames', z.string().optional()), | ||
| isPrivate: zod.alias('isPrivate', z.boolean().optional()), | ||
| logoPath: zod.alias('l', z.string().optional()), | ||
| allowExternalSenders: zod.alias('allowExternalSenders', z.boolean().optional()), | ||
| autoSubscribeNewMembers: zod.alias('autoSubscribeNewMembers', z.boolean().optional()), | ||
| hideFromAddressLists: zod.alias('hideFromAddressLists', z.boolean().optional()), | ||
| hideFromOutlookClients: zod.alias('hideFromOutlookClients', z.boolean().optional()) |
Contributor
There was a problem hiding this comment.
Suggested change
| id: zod.alias('i', z.string().uuid().optional()), | |
| displayName: zod.alias('n', z.string().optional()), | |
| newDisplayName: zod.alias('newDisplayName', z.string().optional()), | |
| description: zod.alias('d', z.string().optional()), | |
| ownerIds: zod.alias('ownerIds', z.string().optional()), | |
| ownerUserNames: zod.alias('ownerUserNames', z.string().optional()), | |
| memberIds: zod.alias('memberIds', z.string().optional()), | |
| memberUserNames: zod.alias('memberUserNames', z.string().optional()), | |
| isPrivate: zod.alias('isPrivate', z.boolean().optional()), | |
| logoPath: zod.alias('l', z.string().optional()), | |
| allowExternalSenders: zod.alias('allowExternalSenders', z.boolean().optional()), | |
| autoSubscribeNewMembers: zod.alias('autoSubscribeNewMembers', z.boolean().optional()), | |
| hideFromAddressLists: zod.alias('hideFromAddressLists', z.boolean().optional()), | |
| hideFromOutlookClients: zod.alias('hideFromOutlookClients', z.boolean().optional()) | |
| id: zod.alias('i', z.string().uuid().optional()), | |
| displayName: zod.alias('n', z.string().optional()), | |
| newDisplayName: z.string().optional(), | |
| description: zod.alias('d', z.string().optional()), | |
| ownerIds: z.string().optional(), | |
| ownerUserNames: z.string().optional(), | |
| memberIds: z.string().optional(), | |
| memberUserNames: z.string().optional(), | |
| isPrivate: z.boolean().optional(), | |
| logoPath: zod.alias('l', z.string().optional()), | |
| allowExternalSenders: z.boolean().optional(), | |
| autoSubscribeNewMembers: z.boolean().optional(), | |
| hideFromAddressLists: z.boolean().optional(), | |
| hideFromOutlookClients: z.boolean().optional() |
| }); | ||
|
|
||
| it('has correct name', () => { | ||
| it("has correct name", () => { |
Contributor
There was a problem hiding this comment.
I would say that we prefer single quotes for the test names.
| import { sinonUtil } from '../../../../utils/sinonUtil.js'; | ||
| import commands from '../../commands.js'; | ||
| import command from './m365group-list.js'; | ||
| import { Group } from "@microsoft/microsoft-graph-types"; |
Contributor
There was a problem hiding this comment.
We prefer single quotes for imports.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Migrates some 'm365group' commands to zod. Closes #6849