Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Role set admin #6974

Merged
merged 5 commits into from
Oct 3, 2024
Merged

Role set admin #6974

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
041fb16
removed old code that was getting admins via usersWithCredentials query
techsmyth Oct 2, 2024
2b3cd4c
moved lookup by credentials to be under the access folder
techsmyth Oct 2, 2024
db881f1
never undefined fix
ccanos Oct 2, 2024
1c5979d
removed usersWithCredentialsSimpleList
ccanos Oct 2, 2024
75ced1e
fix
ccanos Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/core/apollo/generated/apollo-hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2289,6 +2289,9 @@ export const RoleSetDetailsFragmentDoc = gql`
leadUsers: usersInRole(role: LEAD) {
...CommunityMemberUser
}
adminUsers: usersInRole(role: ADMIN) {
...CommunityMemberUser
}
memberOrganizations: organizationsInRole(role: MEMBER) {
...CommunityMemberOrganization
}
Expand Down
196 changes: 196 additions & 0 deletions src/core/apollo/generated/graphql-schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7113,6 +7113,34 @@ export type RoleSetDetailsFragment = {
| undefined;
};
}>;
adminUsers: Array<{
__typename?: 'User';
id: string;
isContactable: boolean;
email: string;
firstName: string;
lastName: string;
profile: {
__typename?: 'Profile';
id: string;
displayName: string;
url: string;
avatar?: { __typename?: 'Visual'; id: string; uri: string; name: string } | undefined;
location?:
| { __typename?: 'Location'; id: string; city?: string | undefined; country?: string | undefined }
| undefined;
tagsets?:
| Array<{
__typename?: 'Tagset';
id: string;
name: string;
tags: Array<string>;
allowedValues: Array<string>;
type: TagsetType;
}>
| undefined;
};
}>;
memberOrganizations: Array<{
__typename?: 'Organization';
id: string;
Expand Down Expand Up @@ -15493,6 +15521,34 @@ export type CommunityMembersListQuery = {
| undefined;
};
}>;
adminUsers: Array<{
__typename?: 'User';
id: string;
isContactable: boolean;
email: string;
firstName: string;
lastName: string;
profile: {
__typename?: 'Profile';
id: string;
displayName: string;
url: string;
avatar?: { __typename?: 'Visual'; id: string; uri: string; name: string } | undefined;
location?:
| { __typename?: 'Location'; id: string; city?: string | undefined; country?: string | undefined }
| undefined;
tagsets?:
| Array<{
__typename?: 'Tagset';
id: string;
name: string;
tags: Array<string>;
allowedValues: Array<string>;
type: TagsetType;
}>
| undefined;
};
}>;
memberOrganizations: Array<{
__typename?: 'Organization';
id: string;
Expand Down Expand Up @@ -19265,6 +19321,34 @@ export type AboutPageMembersQuery = {
| undefined;
};
}>;
adminUsers: Array<{
__typename?: 'User';
id: string;
isContactable: boolean;
email: string;
firstName: string;
lastName: string;
profile: {
__typename?: 'Profile';
id: string;
displayName: string;
url: string;
avatar?: { __typename?: 'Visual'; id: string; uri: string; name: string } | undefined;
location?:
| { __typename?: 'Location'; id: string; city?: string | undefined; country?: string | undefined }
| undefined;
tagsets?:
| Array<{
__typename?: 'Tagset';
id: string;
name: string;
tags: Array<string>;
allowedValues: Array<string>;
type: TagsetType;
}>
| undefined;
};
}>;
memberOrganizations: Array<{
__typename?: 'Organization';
id: string;
Expand Down Expand Up @@ -20172,6 +20256,34 @@ export type SpaceCommunityPageQuery = {
| undefined;
};
}>;
adminUsers: Array<{
__typename?: 'User';
id: string;
isContactable: boolean;
email: string;
firstName: string;
lastName: string;
profile: {
__typename?: 'Profile';
id: string;
displayName: string;
url: string;
avatar?: { __typename?: 'Visual'; id: string; uri: string; name: string } | undefined;
location?:
| { __typename?: 'Location'; id: string; city?: string | undefined; country?: string | undefined }
| undefined;
tagsets?:
| Array<{
__typename?: 'Tagset';
id: string;
name: string;
tags: Array<string>;
allowedValues: Array<string>;
type: TagsetType;
}>
| undefined;
};
}>;
memberOrganizations: Array<{
__typename?: 'Organization';
id: string;
Expand Down Expand Up @@ -21972,6 +22084,34 @@ export type SpaceProfileFragment = {
| undefined;
};
}>;
adminUsers: Array<{
__typename?: 'User';
id: string;
isContactable: boolean;
email: string;
firstName: string;
lastName: string;
profile: {
__typename?: 'Profile';
id: string;
displayName: string;
url: string;
avatar?: { __typename?: 'Visual'; id: string; uri: string; name: string } | undefined;
location?:
| { __typename?: 'Location'; id: string; city?: string | undefined; country?: string | undefined }
| undefined;
tagsets?:
| Array<{
__typename?: 'Tagset';
id: string;
name: string;
tags: Array<string>;
allowedValues: Array<string>;
type: TagsetType;
}>
| undefined;
};
}>;
memberOrganizations: Array<{
__typename?: 'Organization';
id: string;
Expand Down Expand Up @@ -22727,6 +22867,34 @@ export type SubspacePageQuery = {
| undefined;
};
}>;
adminUsers: Array<{
__typename?: 'User';
id: string;
isContactable: boolean;
email: string;
firstName: string;
lastName: string;
profile: {
__typename?: 'Profile';
id: string;
displayName: string;
url: string;
avatar?: { __typename?: 'Visual'; id: string; uri: string; name: string } | undefined;
location?:
| { __typename?: 'Location'; id: string; city?: string | undefined; country?: string | undefined }
| undefined;
tagsets?:
| Array<{
__typename?: 'Tagset';
id: string;
name: string;
tags: Array<string>;
allowedValues: Array<string>;
type: TagsetType;
}>
| undefined;
};
}>;
memberOrganizations: Array<{
__typename?: 'Organization';
id: string;
Expand Down Expand Up @@ -22926,6 +23094,34 @@ export type SubspacePageSpaceFragment = {
| undefined;
};
}>;
adminUsers: Array<{
__typename?: 'User';
id: string;
isContactable: boolean;
email: string;
firstName: string;
lastName: string;
profile: {
__typename?: 'Profile';
id: string;
displayName: string;
url: string;
avatar?: { __typename?: 'Visual'; id: string; uri: string; name: string } | undefined;
location?:
| { __typename?: 'Location'; id: string; city?: string | undefined; country?: string | undefined }
| undefined;
tagsets?:
| Array<{
__typename?: 'Tagset';
id: string;
name: string;
tags: Array<string>;
allowedValues: Array<string>;
type: TagsetType;
}>
| undefined;
};
}>;
memberOrganizations: Array<{
__typename?: 'Organization';
id: string;
Expand Down
3 changes: 3 additions & 0 deletions src/domain/access/RoleSet/graphql/fragments/RoleSetFragments.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ fragment RoleSetDetails on RoleSet {
leadUsers: usersInRole(role: LEAD) {
...CommunityMemberUser
}
adminUsers: usersInRole(role: ADMIN) {
...CommunityMemberUser
}

memberOrganizations: organizationsInRole(role: MEMBER) {
...CommunityMemberOrganization
Expand Down
0 ...phql/queries/usersWithCredentials.graphql → ...omain/access/usersWithCredentials.graphql
View file
Open in desktop
File renamed without changes.
0 ...es/usersWithCredentialsSimpleList.graphql → ...ss/usersWithCredentialsSimpleList.graphql
View file
Open in desktop
File renamed without changes.
Loading