diff --git a/.gitignore b/.gitignore index dae85edce94ba50452bcd94b2d0cbd91a0c3b97a..cb4cbb42d80e9c17935db31b200e772c890703c1 100644 --- a/.gitignore +++ b/.gitignore @@ -131,3 +131,7 @@ config/helpers/tailwind/css_in_js.js # Rubocop cop documentation generation .yardoc + +# yalc for temporary testing +.yalc +yalc.lock diff --git a/app/assets/javascripts/graphql_shared/fragments/user_autocomplete_status.fragment.graphql b/app/assets/javascripts/graphql_shared/fragments/user_autocomplete_status.fragment.graphql new file mode 100644 index 0000000000000000000000000000000000000000..6d71c5d82f62da8ec0e592f79e8c4136191421d5 --- /dev/null +++ b/app/assets/javascripts/graphql_shared/fragments/user_autocomplete_status.fragment.graphql @@ -0,0 +1,9 @@ +# @graphql-eslint/eslint-plugin@4.0.0 reports missing IDs in `FragmentDefinition`. +# Field `id` does not exist on AutocompleteUserStatus yet the linter asks us for it. +# eslint-disable-next-line @graphql-eslint/require-selections +fragment AutocompleteUserStatus on User { + status { + disabledForDuoUsage + disabledForDuoUsageReason + } +} diff --git a/app/assets/javascripts/graphql_shared/queries/workspace_autocomplete_users.query.graphql b/app/assets/javascripts/graphql_shared/queries/workspace_autocomplete_users.query.graphql index 796797c569c49de3ee74d3fe9f35b7cfcf9c38d0..9ddd2e0f3ca5ea891ef76b4ce01bc40285926e44 100644 --- a/app/assets/javascripts/graphql_shared/queries/workspace_autocomplete_users.query.graphql +++ b/app/assets/javascripts/graphql_shared/queries/workspace_autocomplete_users.query.graphql @@ -1,5 +1,6 @@ #import "../fragments/user.fragment.graphql" #import "~/graphql_shared/fragments/user_availability.fragment.graphql" +#import "~/graphql_shared/fragments/user_autocomplete_status.fragment.graphql" query workspaceAutocompleteUsersSearch( $search: String! @@ -12,6 +13,7 @@ query workspaceAutocompleteUsersSearch( compositeIdentityEnforced @gl_introduced(version: "18.7.0") ...User ...UserAvailability + ...AutocompleteUserStatus } } workspace: project(fullPath: $fullPath) { @@ -20,6 +22,7 @@ query workspaceAutocompleteUsersSearch( compositeIdentityEnforced @gl_introduced(version: "18.7.0") ...User ...UserAvailability + ...AutocompleteUserStatus } } } diff --git a/app/assets/javascripts/sidebar/components/assignees/sidebar_participant.vue b/app/assets/javascripts/sidebar/components/assignees/sidebar_participant.vue index 85781d8520b818a39982c4ac9cbb8b84ef8287b9..d1d7e2c6778f32d66d3e6b9b97bb6021dcb266fb 100644 --- a/app/assets/javascripts/sidebar/components/assignees/sidebar_participant.vue +++ b/app/assets/javascripts/sidebar/components/assignees/sidebar_participant.vue @@ -1,7 +1,7 @@