Skip to content

Fix tracker set selection #1668

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
loucass003 merged 6 commits into from
Dec 11, 2025
Merged

Fix tracker set selection #1668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4b0a2d2
Fix tracker set selection
loucass003 Dec 11, 2025
c4acf4c
Better selection + only set the prefered once for a new user
loucass003 Dec 11, 2025
16a2ac8
Lint
loucass003 Dec 11, 2025
9a26fc9
Update gui/src/components/onboarding/pages/trackers-assign/TrackerAss…
loucass003 Dec 11, 2025
ab24828
Update gui/src/components/onboarding/pages/trackers-assign/TrackerAss…
loucass003 Dec 11, 2025
247c063
Lint
loucass003 Dec 11, 2025
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
5 changes: 2 additions & 3 deletions gui/src/components/onboarding/BodyAssignment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export function BodyAssignment({
onlyAssigned = false,
dotSize,
}: {
assignMode: AssignMode;
assignMode: AssignMode | null;
mirror: boolean;
onlyAssigned?: boolean;
rolesWithErrors?: Partial<Record<BodyPart, BodyPartError>>;
Expand Down Expand Up @@ -148,8 +148,7 @@ export function BodyAssignment({
const hasBodyPart = useCallback(
(part: BodyPart) =>
COMMONS.includes(part) ||
assignMode === AssignMode.All ||
ASSIGNMENT_MODES[assignMode].includes(part),
(assignMode && ASSIGNMENT_MODES[assignMode].includes(part)),
[assignMode]
);

Expand Down
28 changes: 12 additions & 16 deletions gui/src/components/onboarding/pages/trackers-assign/TrackerAssignOptions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Radio } from '@/components/commons/Radio';
import { Typography } from '@/components/commons/Typography';
import { AssignMode, defaultConfig, useConfig } from '@/hooks/config';
import { AssignMode, useConfig } from '@/hooks/config';
import { ASSIGNMENT_MODES } from '@/components/onboarding/BodyAssignment';
import { useLocalization } from '@fluent/react';
import { useForm } from 'react-hook-form';
Expand Down Expand Up @@ -61,11 +61,20 @@ export function TrackerAssignOptions({
const connectedIMUTrackers = useAtomValue(connectedIMUTrackersAtom);

const { config, setConfig } = useConfig();
const { control, watch, setValue } = useForm<{

const getPreferredSet = () => {
return (
(Object.entries(ASSIGN_MODE_OPTIONS).find(
([_, count]) => count >= connectedIMUTrackers.length
)?.[0] as AssignMode) ?? AssignMode.All
);
};

const { control, watch } = useForm<{
assignMode: AssignMode;
}>({
defaultValues: {
assignMode: config?.assignMode ?? defaultConfig.assignMode,
assignMode: config?.assignMode || getPreferredSet(),
},
});
const { assignMode } = watch();
Expand All @@ -74,19 +83,6 @@ export function TrackerAssignOptions({
setConfig({ assignMode });
}, [assignMode]);

useEffect(() => {
if (connectedIMUTrackers.length <= ASSIGN_MODE_OPTIONS[assignMode]) return;

const selectedAssignMode =
(Object.entries(ASSIGN_MODE_OPTIONS).find(
([_, count]) => count >= connectedIMUTrackers.length
)?.[0] as AssignMode) ?? AssignMode.All;

if (assignMode !== selectedAssignMode) {
setValue('assignMode', selectedAssignMode);
}
}, [connectedIMUTrackers, assignMode]);

if (variant == 'dropdown')
return (
<Dropdown
Expand Down
2 changes: 1 addition & 1 deletion gui/src/components/onboarding/pages/trackers-assign/TrackerAssignment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ export function TrackersAssignPage() {
onlyAssigned={false}
highlightedRoles={firstError?.affectedRoles || []}
rolesWithErrors={rolesWithErrors}
assignMode={config?.assignMode ?? defaultConfig.assignMode}
assignMode={config?.assignMode ?? null}
mirror={mirrorView}
onRoleSelected={tryOpenChokerWarning}
/>
Expand Down
4 changes: 2 additions & 2 deletions gui/src/hooks/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export interface Config {
fonts: string[];
useTray: boolean | null;
mirrorView: boolean;
assignMode: AssignMode;
assignMode: AssignMode | null;
discordPresence: boolean;
errorTracking: boolean | null;
decorations: boolean;
Expand Down Expand Up @@ -72,7 +72,7 @@ export const defaultConfig: Config = {
fonts: ['poppins'],
useTray: null,
mirrorView: true,
assignMode: AssignMode.Core,
assignMode: null,
discordPresence: false,
errorTracking: null,
decorations: false,
Expand Down