Skip to content

Removing users from orgs #1267

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

Merged
nsdeschenes merged 3 commits into from
Nov 27, 2020
Merged

Removing users from orgs #1267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b657531
complete remove user from org mutation
nsdeschenes Nov 27, 2020
1f1ef5e
impory export new mutation
nsdeschenes Nov 27, 2020
dc47036
translations for new mutation
nsdeschenes Nov 27, 2020
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
8 changes: 4 additions & 4 deletions api-js/src/locale/en/messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,8 @@
'Successfully removed organization: {0}.': function (a) {
return ['Successfully removed organization: ', a('0'), '.']
},
'Successfully removed user from organization.':
'Successfully removed user from organization.',
'Successfully sent invitation to service, and organization email.':
'Successfully sent invitation to service, and organization email.',
'Successfully two factor authenticated.':
Expand Down Expand Up @@ -323,14 +325,12 @@
'Unable to query domains. Please try again.',
'Unable to query organizations. Please try again.':
'Unable to query organizations. Please try again.',
'Unable to query user without a username, please try again.':
'Unable to query user without a username, please try again.',
'Unable to query user, please try again.':
'Unable to query user, please try again.',
'Unable to remove domain. Please try again.':
'Unable to remove domain. Please try again.',
'Unable to remove organization. Please try again.':
'Unable to remove organization. Please try again.',
'Unable to remove user from organization. Please try again.':
'Unable to remove user from organization. Please try again.',
'Unable to reset password. Please try again.':
'Unable to reset password. Please try again.',
'Unable to retrieve {0} for domain: {domain}.': function (a) {
Expand Down
46 changes: 25 additions & 21 deletions api-js/src/locale/en/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ msgstr "Authentication error. Please sign in again."
msgid "Authentication error. Please sign in."
msgstr "Authentication error. Please sign in."

#: src/types/base/index.js:870
#: src/types/base/index.js:866
msgid "Cannot query affiliations on organization without admin permission or higher."
msgstr "Cannot query affiliations on organization without admin permission or higher."

Expand Down Expand Up @@ -80,7 +80,7 @@ msgstr "No verified domain with the provided domain could be found."
msgid "Organization has already been verified."
msgstr "Organization has already been verified."

#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:43
#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:42
#: src/loaders/user-affiliations/load-user-affiliations-by-user-id.js:42
msgid "Passing both `first` and `last` to paginate the `affiliation` is not supported."
msgstr "Passing both `first` and `last` to paginate the `affiliation` is not supported."
Expand Down Expand Up @@ -158,18 +158,18 @@ msgstr "Password was successfully updated."
msgid "Passwords do not match."
msgstr "Passwords do not match."

#: src/auth/check-user-is-admin-for-user.js:17
#: src/auth/check-user-is-admin-for-user.js:27
#: src/auth/check-user-is-admin-for-user.js:59
#: src/auth/check-user-is-admin-for-user.js:69
#: src/auth/check-user-is-admin-for-user.js:19
#: src/auth/check-user-is-admin-for-user.js:29
#: src/auth/check-user-is-admin-for-user.js:60
#: src/auth/check-user-is-admin-for-user.js:70
msgid "Permission error, not an admin for this user."
msgstr "Permission error, not an admin for this user."

#: src/mutations/user/update-user-profile.js:91
msgid "Profile successfully updated."
msgstr "Profile successfully updated."

#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:66
#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:65
#: src/loaders/user-affiliations/load-user-affiliations-by-user-id.js:65
msgid "Requesting `{amount}` records on the `affiliations` exceeds the `{argSet}` limit of 100 records."
msgstr "Requesting `{amount}` records on the `affiliations` exceeds the `{argSet}` limit of 100 records."
Expand Down Expand Up @@ -238,6 +238,10 @@ msgstr "Successfully removed domain: {0} from {1}."
msgid "Successfully removed organization: {0}."
msgstr "Successfully removed organization: {0}."

#: src/mutations/user-affiliations/remove-user-from-org.js:118
msgid "Successfully removed user from organization."
msgstr "Successfully removed user from organization."

#: src/mutations/user-affiliations/invite-user-to-org.js:127
msgid "Successfully sent invitation to service, and organization email."
msgstr "Successfully sent invitation to service, and organization email."
Expand Down Expand Up @@ -403,7 +407,7 @@ msgstr "Unable to invite user. Please try again."
msgid "Unable to invite yourself to an org. Please try again."
msgstr "Unable to invite yourself to an org. Please try again."

#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:147
#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:146
#: src/loaders/user-affiliations/load-user-affiliations-by-user-id.js:146
msgid "Unable to load affiliations. Please try again."
msgstr "Unable to load affiliations. Please try again."
Expand Down Expand Up @@ -499,7 +503,7 @@ msgstr "Unable to load verified organizations. Please try again."
msgid "Unable to load web summary. Please try again."
msgstr "Unable to load web summary. Please try again."

#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:137
#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:136
#: src/loaders/user-affiliations/load-user-affiliations-by-user-id.js:136
msgid "Unable to query affiliations. Please try again."
msgstr "Unable to query affiliations. Please try again."
Expand All @@ -512,14 +516,6 @@ msgstr "Unable to query domains. Please try again."
msgid "Unable to query organizations. Please try again."
msgstr "Unable to query organizations. Please try again."

#: src/queries/user/find-user-by-username.js:34
msgid "Unable to query user without a username, please try again."
msgstr "Unable to query user without a username, please try again."

#: src/queries/user/find-user-by-username.js:50
msgid "Unable to query user, please try again."
msgstr "Unable to query user, please try again."

#: src/mutations/domain/remove-domain.js:58
#: src/mutations/domain/remove-domain.js:69
#: src/mutations/domain/remove-domain.js:80
Expand All @@ -541,6 +537,14 @@ msgstr "Unable to remove domain. Please try again."
msgid "Unable to remove organization. Please try again."
msgstr "Unable to remove organization. Please try again."

#: src/mutations/user-affiliations/remove-user-from-org.js:52
#: src/mutations/user-affiliations/remove-user-from-org.js:63
#: src/mutations/user-affiliations/remove-user-from-org.js:74
#: src/mutations/user-affiliations/remove-user-from-org.js:102
#: src/mutations/user-affiliations/remove-user-from-org.js:113
msgid "Unable to remove user from organization. Please try again."
msgstr "Unable to remove user from organization. Please try again."

#: src/mutations/user/reset-password.js:60
#: src/mutations/user/reset-password.js:70
#: src/mutations/user/reset-password.js:78
Expand Down Expand Up @@ -677,7 +681,7 @@ msgstr "Unable to verify if user is an admin, please try again."
msgid "Unable to verify organization. Please try again."
msgstr "Unable to verify organization. Please try again."

#: src/queries/user/find-user-by-username.js:60
#: src/queries/user/find-user-by-username.js:40
msgid "User could not be queried."
msgstr "User could not be queried."

Expand All @@ -697,7 +701,7 @@ msgstr "We've sent you a text message with an authentication code to sign into P
msgid "We've sent you an email with an authentication code to sign into Pulse."
msgstr "We've sent you an email with an authentication code to sign into Pulse."

#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:34
#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:33
#: src/loaders/user-affiliations/load-user-affiliations-by-user-id.js:33
msgid "You must provide a `first` or `last` value to properly paginate the `affiliation`."
msgstr "You must provide a `first` or `last` value to properly paginate the `affiliation`."
Expand Down Expand Up @@ -767,7 +771,7 @@ msgstr "You must provide a `first` or `last` value to properly paginate the `ver
#: src/loaders/guidance-tags/load-ssl-guidance-tags-connections.js:77
#: src/loaders/organizations/load-organization-connections-by-domain-id.js:81
#: src/loaders/organizations/load-organization-connections-by-user-id.js:81
#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:81
#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:80
#: src/loaders/user-affiliations/load-user-affiliations-by-user-id.js:80
#: src/loaders/verified-domains/load-verified-domain-connections-by-organization-id.js:79
#: src/loaders/verified-domains/load-verified-domain-connections.js:80
Expand All @@ -778,7 +782,7 @@ msgstr "You must provide a `first` or `last` value to properly paginate the `ver
msgid "`{argSet}` must be of type `number` not `{typeSet}`."
msgstr "`{argSet}` must be of type `number` not `{typeSet}`."

#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:55
#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:54
#: src/loaders/user-affiliations/load-user-affiliations-by-user-id.js:54
msgid "`{argSet}` on the `affiliations` cannot be less than zero."
msgstr "`{argSet}` on the `affiliations` cannot be less than zero."
Expand Down
4 changes: 2 additions & 2 deletions api-js/src/locale/fr/messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
'todo',
'Successfully removed domain: {0} from {1}.': 'todo',
'Successfully removed organization: {0}.': 'todo',
'Successfully removed user from organization.': 'todo',
'Successfully sent invitation to service, and organization email.': 'todo',
'Successfully two factor authenticated.': 'todo',
'Successfully verified account.': 'todo',
Expand Down Expand Up @@ -136,10 +137,9 @@
'Unable to query affiliations. Please try again.': 'todo',
'Unable to query domains. Please try again.': 'todo',
'Unable to query organizations. Please try again.': 'todo',
'Unable to query user without a username, please try again.': 'todo',
'Unable to query user, please try again.': 'todo',
'Unable to remove domain. Please try again.': 'todo',
'Unable to remove organization. Please try again.': 'todo',
'Unable to remove user from organization. Please try again.': 'todo',
'Unable to reset password. Please try again.': 'todo',
'Unable to retrieve {0} for domain: {domain}.': 'todo',
'Unable to send TFA code, please try again.': 'todo',
Expand Down
46 changes: 25 additions & 21 deletions api-js/src/locale/fr/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ msgstr "todo"
msgid "Authentication error. Please sign in."
msgstr "todo"

#: src/types/base/index.js:870
#: src/types/base/index.js:866
msgid "Cannot query affiliations on organization without admin permission or higher."
msgstr "todo"

Expand Down Expand Up @@ -80,7 +80,7 @@ msgstr "todo"
msgid "Organization has already been verified."
msgstr "todo"

#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:43
#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:42
#: src/loaders/user-affiliations/load-user-affiliations-by-user-id.js:42
msgid "Passing both `first` and `last` to paginate the `affiliation` is not supported."
msgstr "todo"
Expand Down Expand Up @@ -158,18 +158,18 @@ msgstr "todo"
msgid "Passwords do not match."
msgstr "todo"

#: src/auth/check-user-is-admin-for-user.js:17
#: src/auth/check-user-is-admin-for-user.js:27
#: src/auth/check-user-is-admin-for-user.js:59
#: src/auth/check-user-is-admin-for-user.js:69
#: src/auth/check-user-is-admin-for-user.js:19
#: src/auth/check-user-is-admin-for-user.js:29
#: src/auth/check-user-is-admin-for-user.js:60
#: src/auth/check-user-is-admin-for-user.js:70
msgid "Permission error, not an admin for this user."
msgstr "todo"

#: src/mutations/user/update-user-profile.js:91
msgid "Profile successfully updated."
msgstr "todo"

#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:66
#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:65
#: src/loaders/user-affiliations/load-user-affiliations-by-user-id.js:65
msgid "Requesting `{amount}` records on the `affiliations` exceeds the `{argSet}` limit of 100 records."
msgstr "todo"
Expand Down Expand Up @@ -238,6 +238,10 @@ msgstr "todo"
msgid "Successfully removed organization: {0}."
msgstr "todo"

#: src/mutations/user-affiliations/remove-user-from-org.js:118
msgid "Successfully removed user from organization."
msgstr "todo"

#: src/mutations/user-affiliations/invite-user-to-org.js:127
msgid "Successfully sent invitation to service, and organization email."
msgstr "todo"
Expand Down Expand Up @@ -403,7 +407,7 @@ msgstr "todo"
msgid "Unable to invite yourself to an org. Please try again."
msgstr "todo"

#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:147
#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:146
#: src/loaders/user-affiliations/load-user-affiliations-by-user-id.js:146
msgid "Unable to load affiliations. Please try again."
msgstr "todo"
Expand Down Expand Up @@ -499,7 +503,7 @@ msgstr "todo"
msgid "Unable to load web summary. Please try again."
msgstr "todo"

#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:137
#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:136
#: src/loaders/user-affiliations/load-user-affiliations-by-user-id.js:136
msgid "Unable to query affiliations. Please try again."
msgstr "todo"
Expand All @@ -512,14 +516,6 @@ msgstr "todo"
msgid "Unable to query organizations. Please try again."
msgstr "todo"

#: src/queries/user/find-user-by-username.js:34
msgid "Unable to query user without a username, please try again."
msgstr "todo"

#: src/queries/user/find-user-by-username.js:50
msgid "Unable to query user, please try again."
msgstr "todo"

#: src/mutations/domain/remove-domain.js:58
#: src/mutations/domain/remove-domain.js:69
#: src/mutations/domain/remove-domain.js:80
Expand All @@ -541,6 +537,14 @@ msgstr "todo"
msgid "Unable to remove organization. Please try again."
msgstr "todo"

#: src/mutations/user-affiliations/remove-user-from-org.js:52
#: src/mutations/user-affiliations/remove-user-from-org.js:63
#: src/mutations/user-affiliations/remove-user-from-org.js:74
#: src/mutations/user-affiliations/remove-user-from-org.js:102
#: src/mutations/user-affiliations/remove-user-from-org.js:113
msgid "Unable to remove user from organization. Please try again."
msgstr "todo"

#: src/mutations/user/reset-password.js:60
#: src/mutations/user/reset-password.js:70
#: src/mutations/user/reset-password.js:78
Expand Down Expand Up @@ -677,7 +681,7 @@ msgstr "todo"
msgid "Unable to verify organization. Please try again."
msgstr "todo"

#: src/queries/user/find-user-by-username.js:60
#: src/queries/user/find-user-by-username.js:40
msgid "User could not be queried."
msgstr "todo"

Expand All @@ -697,7 +701,7 @@ msgstr "todo"
msgid "We've sent you an email with an authentication code to sign into Pulse."
msgstr "todo"

#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:34
#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:33
#: src/loaders/user-affiliations/load-user-affiliations-by-user-id.js:33
msgid "You must provide a `first` or `last` value to properly paginate the `affiliation`."
msgstr "todo"
Expand Down Expand Up @@ -767,7 +771,7 @@ msgstr "todo"
#: src/loaders/guidance-tags/load-ssl-guidance-tags-connections.js:77
#: src/loaders/organizations/load-organization-connections-by-domain-id.js:81
#: src/loaders/organizations/load-organization-connections-by-user-id.js:81
#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:81
#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:80
#: src/loaders/user-affiliations/load-user-affiliations-by-user-id.js:80
#: src/loaders/verified-domains/load-verified-domain-connections-by-organization-id.js:79
#: src/loaders/verified-domains/load-verified-domain-connections.js:80
Expand All @@ -778,7 +782,7 @@ msgstr "todo"
msgid "`{argSet}` must be of type `number` not `{typeSet}`."
msgstr "todo"

#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:55
#: src/loaders/user-affiliations/load-user-affiliations-by-org-id.js:54
#: src/loaders/user-affiliations/load-user-affiliations-by-user-id.js:54
msgid "`{argSet}` on the `affiliations` cannot be less than zero."
msgstr "todo"
Expand Down
Loading