Merge pull request #10944 from neinteractiveliterature/nbudin/issue10084

"random game" end of queue option

Author: nbudin

app/graphql/graphql_operations_generated.json

@@ -0,0 +1,5 @@
+class Types::RankedChoiceFallbackAction < Types::BaseEnum
+  description "An action to take if a user can't be signed up for any of their ranked choices during a signup round"
+
+  UserConProfile.ranked_choice_fallback_actions.each_value { |enum_value| value enum_value.upcase, value: enum_value }
+end

app/graphql/types/ranked_choice_fallback_action.rb

@@ -35,8 +35,8 @@ class Types::UserConProfileInputType < Types::BaseInputObject
   argument :preferred_contact, String, required: false, camelize: false do
     description "The method by which this user profile prefers the convention contact them."
   end
-  argument :ranked_choice_allow_waitlist, Boolean, required: false, camelize: false do
-    description "If this user can't be signed up for any of their ranked choices, should the site waitlist them?"
+  argument :ranked_choice_fallback_action, Types::RankedChoiceFallbackAction, required: false, camelize: false do
+    description "If this user can't be signed up for any of their ranked choices, what should the site do?"
   end
   argument :show_nickname_in_bio, Boolean, required: false, camelize: false do
     description "Should this profile's bio use the nickname as part of their name?"

app/graphql/types/user_con_profile_input_type.rb

@@ -56,9 +56,15 @@ def self.personal_info_field(field_name, ...)
   field :nickname, String, null: true, description: "This user profile's nickname."
   field :order_summary, String, null: false, description: "A human-readable summary of all this profile's orders."
   field :orders, [Types::OrderType], null: false, description: "All the orders placed by this profile."
-  field :ranked_choice_allow_waitlist, Boolean, null: false do
+  field :ranked_choice_allow_waitlist,
+        Boolean,
+        null: false,
+        deprecation_reason: "Use ranked_choice_fallback_action instead" do
     description "If this user can't be signed up for any of their ranked choices, should the site waitlist them?"
   end
+  field :ranked_choice_fallback_action, Types::RankedChoiceFallbackAction, null: false do
+    description "If this user can't be signed up for any of their ranked choices, what should the site do?"
+  end
   field :ranked_choice_user_constraints, [Types::RankedChoiceUserConstraintType], null: false do # rubocop:disable GraphQL/ExtractType
     description "All the constraints this profile has placed on the number of ranked choice signups they want."
   end
@@ -116,7 +122,7 @@ def self.personal_info_field(field_name, ...)
   personal_info_field :user, Types::UserType, null: true, description: "The user account attached to this profile."
   personal_info_field :zipcode, String, null: true, description: "The ZIP portion of this profile's mailing address."
 
-  def site_admin
+  def site_admin # rubocop:disable Naming/PredicateMethod
     dataloader.with(Sources::ActiveRecordAssociation, UserConProfile, :user).load(object).site_admin?
   end
 
@@ -198,7 +204,7 @@ def order_summary
     dataloader.with(Sources::OrderSummary).load(object)
   end
 
-  def can_override_maximum_event_provided_tickets
+  def can_override_maximum_event_provided_tickets # rubocop:disable Naming/PredicateMethod
     user = object == context[:user_con_profile] ? pundit_user : AuthorizationInfo.new(object.user, nil)
 
     override = context[:convention].ticket_types.new.maximum_event_provided_tickets_overrides.new
@@ -210,6 +216,10 @@ def ticket
     ticket && policy(ticket).read? ? ticket : nil
   end
 
+  def ranked_choice_allow_waitlist # rubocop:disable Naming/PredicateMethod
+    object.ranked_choice_fallback_action == "waitlist"
+  end
+
   private
 
   # Not exposed as a field, but needed by FormResponseAttrsFields

app/graphql/types/user_con_profile_type.rb

@@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next';
 import { useAppDateTimeFormat } from '../../TimeUtils';
 import { DateTime } from 'luxon';
 import Timespan from '../../Timespan';
-import { RankedChoiceUserConstraint, SignupState } from '../../graphqlTypes.generated';
+import { RankedChoiceFallbackAction, RankedChoiceUserConstraint, SignupState } from '../../graphqlTypes.generated';
 import BucketAvailabilityDisplay from '../EventPage/BucketAvailabilityDisplay';
 import { useMutation } from '@apollo/client';
 import { UpdateUserConProfileDocument } from '../../UserConProfiles/mutations.generated';
@@ -224,21 +224,22 @@ function RankedChoiceUserSettings({ data }: { data: MySignupQueueQueryData }) {
       <div className="card-header">{t('signups.mySignupQueue.settingsSection.label')}</div>
       <div className="card-body">
         <MultipleChoiceInput
-          caption={t('signups.mySignupQueue.allowWaitlist.caption')}
+          caption={t('signups.mySignupQueue.fallbackAction.caption')}
           choices={[
-            {
-              label: t('signups.mySignupQueue.allowWaitlist.yes'),
-              value: 'true',
-            },
-            { label: t('signups.mySignupQueue.allowWaitlist.no'), value: 'false' },
-          ]}
-          value={(data.convention.my_profile?.ranked_choice_allow_waitlist || false).toString()}
+            RankedChoiceFallbackAction.Waitlist,
+            RankedChoiceFallbackAction.RandomSignup,
+            RankedChoiceFallbackAction.None,
+          ].map((value) => ({
+            label: t(`signups.mySignupQueue.fallbackAction.${value}`),
+            value,
+          }))}
+          value={data.convention.my_profile?.ranked_choice_fallback_action}
           onChange={async (newValue) => {
             await updateUserConProfile({
               variables: {
                 input: {
                   user_con_profile: {
-                    ranked_choice_allow_waitlist: newValue === 'true',
+                    ranked_choice_fallback_action: newValue as RankedChoiceFallbackAction,
                   },
                   id: myProfile?.id,
                 },

app/javascript/EventsApp/MySignupQueue/RankedChoiceUserSettings.tsx

@@ -1,4 +1,4 @@
-import { RankedChoiceDecisionReason, SignupState } from 'graphqlTypes.generated';
+import { RankedChoiceDecisionReason, RankedChoiceFallbackAction, SignupState } from 'graphqlTypes.generated';
 import { DateTime } from 'luxon';
 import { Trans, useTranslation } from 'react-i18next';
 import { formatLCM, getDateTimeFormat } from 'TimeUtils';
@@ -80,7 +80,7 @@ export function SkipReason({ pendingChoice, simulatedSkipReason, userConProfile
       </>
     );
   } else if (simulatedSkipReason.reason === RankedChoiceDecisionReason.Full) {
-    if (userConProfile.ranked_choice_allow_waitlist) {
+    if (userConProfile.ranked_choice_fallback_action === RankedChoiceFallbackAction.Waitlist) {
       if (pendingChoice.prioritize_waitlist) {
         return (
           <>

app/javascript/EventsApp/MySignupQueue/SignupQueueMessages.tsx

@@ -6,7 +6,7 @@ import {
   UpdateSignupRankedChoicePriorityDocument,
 } from './mutations.generated';
 import { Link, useRevalidator } from 'react-router';
-import { RankedChoiceDecisionReason } from 'graphqlTypes.generated';
+import { RankedChoiceDecisionReason, RankedChoiceFallbackAction } from 'graphqlTypes.generated';
 import { ReactNode, useContext, useRef, useState } from 'react';
 import { flushSync } from 'react-dom';
 import RankedChoicePriorityIndicator from './RankedChoicePriorityIndicator';
@@ -90,7 +90,7 @@ export default function UserSignupQueueItem({
         [styles.skip]: pendingChoice.simulated_skip_reason,
         [styles.waitlist]:
           pendingChoice.simulated_skip_reason?.reason === RankedChoiceDecisionReason.Full &&
-          userConProfile.ranked_choice_allow_waitlist,
+          userConProfile.ranked_choice_fallback_action === RankedChoiceFallbackAction.Waitlist,
       })}
       style={{
         // @ts-expect-error awaiting fix for https://github.com/frenic/csstype/issues/193

app/javascript/EventsApp/MySignupQueue/UserSignupQueueItem.tsx

@@ -7,7 +7,7 @@ fragment RankedChoiceUserConstraintFields on RankedChoiceUserConstraint {
 
 fragment UserConProfileRankedChoiceQueueFields on UserConProfile {
   id
-  ranked_choice_allow_waitlist
+  ranked_choice_fallback_action
 
   ranked_choice_user_constraints {
     id