Commitc619138

authored

fix: Display Everyone group in the autocomplete (#4488)

1 parent6235708 commitc619138Copy full SHA for c619138

File tree

+34

-6

lines changed

+34

-6

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import { Group, User } from "api/typesGenerated"`
`7`	`7`	`import{AvatarData}from"components/AvatarData/AvatarData"`
`8`	`8`	`importdebouncefrom"just-debounce-it"`
`9`	`9`	`import{ChangeEvent,useState}from"react"`
	`10`	`+import{getGroupSubtitle}from"util/groups"`
`10`	`11`	`import{searchUsersAndGroupsMachine}from"xServices/template/searchUsersAndGroupsXService"`
`11`	`12`
`12`	`13`	`exporttypeUserOrGroupAutocompleteValue=User\|Group\|null`
`@@ -75,9 +76,7 @@ export const UserOrGroupAutocomplete: React.FC<`
`75`	`76`	`return(`
`76`	`77`	`<AvatarData`
`77`	`78`	`title={isOptionGroup ?option.name :option.username}`
`78`		`-subtitle={`
`79`		-isOptionGroup ?`${option.members.length} members` :option.email
`80`		`-}`
	`79`	`+subtitle={isOptionGroup ?getGroupSubtitle(option) :option.email}`
`81`	`80`	`highlightTitle`
`82`	`81`	`avatar={`
`83`	`82`	`!isOptionGroup&&option.avatar_url ?(`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ import {`
`29`	`29`	`import{FC,useState}from"react"`
`30`	`30`	`import{Maybe}from"components/Conditionals/Maybe"`
`31`	`31`	`import{GroupAvatar}from"components/GroupAvatar/GroupAvatar"`
	`32`	`+import{getGroupSubtitle}from"util/groups"`
`32`	`33`
`33`	`34`	`typeAddTemplateUserOrGroupProps={`
`34`	`35`	`organizationId:string`
`@@ -239,7 +240,7 @@ export const TemplatePermissionsPageView: FC<`
`239`	`240`	`<AvatarData`
`240`	`241`	`avatar={<GroupAvatarname={group.name}/>}`
`241`	`242`	`title={group.name}`
`242`		-subtitle={`${group.members.length} members`}
	`243`	`+subtitle={getGroupSubtitle(group)}`
`243`	`244`	`highlightTitle`
`244`	`245`	`/>`
`245`	`246`	`</TableCell>`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import{FieldError}from"api/errors"`
	`2`	`+import{everyOneGroup}from"util/groups"`
`2`	`3`	`import*asTypesfrom"../api/types"`
`3`	`4`	`import*asTypesGenfrom"../api/typesGenerated"`
`4`	`5`
`@@ -918,7 +919,10 @@ export const MockGroup: TypesGen.Group = {`
`918`	`919`	`}`
`919`	`920`
`920`	`921`	`exportconstMockTemplateACL:TypesGen.TemplateACL={`
`921`		`-group:[{ ...MockGroup,role:"admin"}],`
	`922`	`+group:[`
	`923`	`+{ ...everyOneGroup(MockOrganization.id),role:"view"},`
	`924`	`+{ ...MockGroup,role:"admin"},`
	`925`	`+],`
`922`	`926`	`users:[{ ...MockUser,role:"view"}],`
`923`	`927`	`}`
`924`	`928`

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,21 @@`
	`1`	`+import{Group}from"api/typesGenerated"`
	`2`	`+`
	`3`	`+exportconsteveryOneGroup=(organizationId:string):Group=>({`
	`4`	`+id:organizationId,`
	`5`	`+name:"Everyone",`
	`6`	`+organization_id:organizationId,`
	`7`	`+members:[],`
	`8`	`+})`
	`9`	`+`
	`10`	`+exportconstgetGroupSubtitle=(group:Group):string=>{`
	`11`	`+// It is the everyone group when a group id is the same of the org id`
	`12`	`+if(group.id===group.organization_id){`
	`13`	+return`All users`
	`14`	`+}`
	`15`	`+`
	`16`	`+if(group.members.length===1){`
	`17`	+return`1 member`
	`18`	`+}`
	`19`	`+`
	`20`	+return`${group.members.length} members`
	`21`	`+}`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import{getGroups,getUsers}from"api/api"`
`2`	`2`	`import{Group,User}from"api/typesGenerated"`
`3`	`3`	`import{queryToFilter}from"util/filters"`
	`4`	`+import{everyOneGroup}from"util/groups"`
`4`	`5`	`import{assign,createMachine}from"xstate"`
`5`	`6`
`6`	`7`	`exporttypeSearchUsersAndGroupsEvent=`
`@@ -61,7 +62,9 @@ export const searchUsersAndGroupsMachine = createMachine(`
`61`	`62`	`getGroups(organizationId),`
`62`	`63`	`])`
`63`	`64`
`64`		`-return{ users, groups}`
	`65`	`+// The Everyone groups is not returned by the API so we have to add it`
	`66`	`+// manually`
	`67`	`+return{ users,groups:[everyOneGroup(organizationId), ...groups]}`
`65`	`68`	`},`
`66`	`69`	`},`
`67`	`70`	`actions:{`

Comments

(0)