Skip to content

Commit

Permalink
switched to fetching competitionInfo
Browse files Browse the repository at this point in the history
  • Loading branch information
dunkOnIT committed Jan 30, 2025
1 parent 1c407e5 commit 050f2ec
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 11 deletions.
2 changes: 1 addition & 1 deletion app/views/registrations/edit.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% provide(:title, t('registrations.edit_registration.title', person: @user.person&.name || @user.name, comp: @competition.name)) %>
<%= render layout: 'nav' do %>
<%= react_component('RegistrationsV2/RegistrationEdit', { competitionInfo: @competition.to_competition_info ,
<%= react_component('RegistrationsV2/RegistrationEdit', { competitionId: @competition.id ,
user: @user }) %>
<% end %>
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
} from 'semantic-ui-react';
import { DateTime } from 'luxon';
import { getAllRegistrations } from '../api/registration/get/get_registrations';
import getCompetitionInfo from '../api/competition/get_competition_info';
import createSortReducer from '../reducers/sortReducer';
import RegistrationActions from './RegistrationActions';
import { setMessage } from '../Register/RegistrationMessage';
Expand Down Expand Up @@ -115,7 +116,28 @@ const columnReducer = (state, action) => {
return state;
};

export default function RegistrationAdministrationList({ competitionInfo }) {
export default function RegistrationAdministrationList({ competitionId }) {
const {
isLoading: isCompetitionInfoLoading,

Check failure on line 121 in app/webpacker/components/RegistrationsV2/RegistrationAdministration/RegistrationAdministrationList.jsx

View workflow job for this annotation

GitHub Actions / test

'isCompetitionInfoLoading' is assigned a value but never used.
data: competitionInfo,
refetchCompetitionInfo,
} = useQuery({
queryKey: ['competitionInfo', competitionId],
queryFn: () => getCompetitionInfo(competitionId),
refetchOnWindowFocus: false,
refetchOnReconnect: false,
staleTime: Infinity,
refetchOnMount: 'always',

This comment has been minimized.

Copy link
@FinnIckler

FinnIckler Jan 30, 2025

Member

we have these settings as default in the WCAQueryProvider

retry: false,
onError: (err) => {
const { errorCode } = err;

Check failure on line 133 in app/webpacker/components/RegistrationsV2/RegistrationAdministration/RegistrationAdministrationList.jsx

View workflow job for this annotation

GitHub Actions / test

'errorCode' is assigned a value but never used.
dispatchStore(setMessage(

Check failure on line 134 in app/webpacker/components/RegistrationsV2/RegistrationAdministration/RegistrationAdministrationList.jsx

View workflow job for this annotation

GitHub Actions / test

'dispatchStore' was used before it was defined.
`competitions.errors.cant_load_competition_info`,

Check failure on line 135 in app/webpacker/components/RegistrationsV2/RegistrationAdministration/RegistrationAdministrationList.jsx

View workflow job for this annotation

GitHub Actions / test

Strings must use singlequote.
'negative',
));
},
});

const [expandedColumns, dispatchColumns] = useReducer(
columnReducer,
initialExpandedColumns,
Expand All @@ -127,10 +149,6 @@ export default function RegistrationAdministrationList({ competitionInfo }) {

const actionsRef = useRef();

const [autoAcceptEnabled, setAutoAcceptEnabled] = useState(
competitionInfo.auto_accept_registrations,
);

const [state, dispatchSort] = useReducer(sortReducer, {
sortColumn: competitionInfo['using_payment_integrations?']
? 'paid_on_with_registered_on_fallback'
Expand Down Expand Up @@ -171,9 +189,9 @@ export default function RegistrationAdministrationList({ competitionInfo }) {
'negative',
));
},
onSuccess: () => {
onSuccess: async () => {
dispatchStore(setMessage('competitions.registration_v2.auto_accept.disabled', 'positive'));
setAutoAcceptEnabled(false);
await refetchCompetitionInfo();
},
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import messageReducer from '../reducers/messageReducer';
import StoreProvider from '../../../lib/providers/StoreProvider';
import WCAQueryClientProvider from '../../../lib/providers/WCAQueryClientProvider';

export default function RegistrationEdit({ competitionInfo }) {
export default function RegistrationEdit({ competitionId }) {
const ref = useRef();
return (
<div ref={ref}>
Expand All @@ -15,7 +15,7 @@ export default function RegistrationEdit({ competitionInfo }) {
<Sticky context={ref} offset={60}>
<RegistrationMessage />
</Sticky>
<RegistrationAdministrationList competitionInfo={competitionInfo} />
<RegistrationAdministrationList competitionId={competitionId} />
</StoreProvider>
</WCAQueryClientProvider>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { competitionApiUrl } from '../../../../lib/requests/routes.js.erb';
import { fetchJsonOrError } from '../../../../lib/requests/fetchWithAuthenticityToken';

export default async function getCompetitionInfo(competitionId) {
const route = competitionApiUrl(competitionId);
const { data } = await fetchJsonOrError(route);
return data;
}
2 changes: 1 addition & 1 deletion app/webpacker/lib/requests/routes.js.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ function jsonToQueryString(json) {
Object.entries(json).filter(([key, value]) => value !== null && value !== undefined)
);
return (new URLSearchParams(jsonAfterRemovingUndefinedAndNull)).toString();
}

This comment has been minimized.

Copy link
@FinnIckler

FinnIckler Jan 30, 2025

Member

copy paste whoopsie

This comment has been minimized.

Copy link
@dunkOnIT

dunkOnIT Jan 30, 2025

Author Contributor

Fixed :D

}routes.js.erb

export const editPersonUrl = (userId) => `<%= CGI.unescape(Rails.application.routes.url_helpers.edit_user_path("${userId}"))%>`;

Expand Down
1 change: 1 addition & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1954,6 +1954,7 @@ en:
-6002: "You need to finish your registration before you can pay"
#context: and when an error occured
errors:
cant_load_competition_info: "Failed to load competition information - please retry or contact WST if this error persists."
must_use_wca_registration: "Auto-accept can only be used if you are using the WCA website for registrations"
auto_accept_limit: "Limit for auto-accepted registrations must be less than the competitor limit"
auto_accept_not_negative: "Limit for auto-accepted registrations cannot be less than 0."
Expand Down

0 comments on commit 050f2ec

Please sign in to comment.