persist start.gg selected set chain

#62

src/main/ipc.ts

@@ -37,6 +37,8 @@ import {
   getCurrentTournament,
   getSelectedSet,
   setSelectedSetId,
+  getSelectedSetChain,
+  setSelectedSetChain,
 } from './startgg';
 import { enforceReplays, getReplaysInDir, writeReplays } from './replay';
 import {
@@ -234,11 +236,27 @@ export default function setupIPCs(mainWindow: BrowserWindow): void {
   ipcMain.removeHandler('setSelectedSetId');
   ipcMain.handle(
     'setSelectedSetId',
-    async (event: IpcMainInvokeEvent, selectedSetId: number) => {
+    (event: IpcMainInvokeEvent, selectedSetId: number) => {
       setSelectedSetId(selectedSetId);
     },
   );
 
+  ipcMain.removeHandler('getSelectedSetChain');
+  ipcMain.handle('getSelectedSetChain', getSelectedSetChain);
+
+  ipcMain.removeHandler('setSelectedSetChain');
+  ipcMain.handle(
+    'setSelectedSetChain',
+    (
+      event: IpcMainInvokeEvent,
+      eventId: number,
+      phaseId: number,
+      phaseGroupId: number,
+    ) => {
+      setSelectedSetChain(eventId, phaseId, phaseGroupId);
+    },
+  );
+
   ipcMain.removeHandler('getTournament');
   ipcMain.handle(
     'getTournament',

src/main/preload.ts

@@ -6,9 +6,12 @@ import {
   Context,
   CopySettings,
   EnforceResult,
+  Event,
   InvalidReplay,
   Mode,
   Output,
+  Phase,
+  PhaseGroup,
   Replay,
   ReportSettings,
   Set,
@@ -54,6 +57,17 @@ const electronHandler = {
     ipcRenderer.invoke('getCurrentTournament'),
   getSelectedSet: (): Promise<Set | undefined> =>
     ipcRenderer.invoke('getSelectedSet'),
+  getSelectedSetChain: (): Promise<{
+    event: Event | undefined;
+    phase: Phase | undefined;
+    phaseGroup: PhaseGroup | undefined;
+  }> => ipcRenderer.invoke('getSelectedSetChain'),
+  setSelectedSetChain: (
+    eventId: number,
+    phaseId: number,
+    phaseGroupId: number,
+  ): Promise<void> =>
+    ipcRenderer.invoke('setSelectedSetChain', eventId, phaseId, phaseGroupId),
   getTournament: (slug: string, recursive: boolean): Promise<void> =>
     ipcRenderer.invoke('getTournament', slug, recursive),
   getEvent: (id: number, recursive: boolean): Promise<void> =>

src/main/startgg.ts

@@ -24,6 +24,9 @@ const phaseGroupIdToEntrants = new Map<number, Entrant[]>();
 const phaseGroupIdToSets = new Map<number, Sets>();
 const idToSet = new Map<number, Set>();
 let selectedSetId = 0;
+let selectedPhaseGroupId = 0;
+let selectedPhaseId = 0;
+let selectedEventId = 0;
 export function getCurrentTournament() {
   if (!currentTournament) {
     return undefined;
@@ -56,17 +59,31 @@ export function getCurrentTournament() {
 }
 
 export function getSelectedSet() {
-  if (!selectedSetId) {
-    return undefined;
-  }
-
   return idToSet.get(selectedSetId);
 }
 
 export function setSelectedSetId(id: number) {
   selectedSetId = id;
 }
 
+export function getSelectedSetChain() {
+  return {
+    event: idToEvent.get(selectedEventId),
+    phase: idToPhase.get(selectedPhaseId),
+    phaseGroup: idToPhaseGroup.get(selectedPhaseGroupId),
+  };
+}
+
+export function setSelectedSetChain(
+  eventId: number,
+  phaseId: number,
+  phaseGroupId: number,
+) {
+  selectedEventId = eventId;
+  selectedPhaseId = phaseId;
+  selectedPhaseGroupId = phaseGroupId;
+}
+
 async function wrappedFetch(
   input: URL | RequestInfo,
   init?: RequestInit | undefined,

src/renderer/App.tsx

@@ -183,6 +183,9 @@ function Hello() {
   const [dirInit, setDirInit] = useState(false);
   const [copyDir, setCopyDir] = useState('');
   const [selectedSet, setSelectedSet] = useState<Set>(EMPTY_SET);
+  const [selectedSetChain, setSelectedSetChain] = useState(
+    EMPTY_SELECTED_SET_CHAIN,
+  );
   const [slug, setSlug] = useState('');
   const [tournament, setTournament] = useState<Tournament>({
     slug: '',
@@ -210,6 +213,7 @@ function Hello() {
       const copyDirPromise = window.electron.getCopyDir();
       const tournamentPromise = window.electron.getCurrentTournament();
       const selectedSetPromise = window.electron.getSelectedSet();
+      const selectedSetChainPromise = window.electron.getSelectedSetChain();
 
       // req network
       const latestAppVersionPromise = window.electron.getLatestVersion();
@@ -243,6 +247,19 @@ function Hello() {
       if (initSelectedSet) {
         setSelectedSet(initSelectedSet);
       }
+      const initSelectedSetChain = await selectedSetChainPromise;
+      const { event, phase, phaseGroup } = initSelectedSetChain;
+      if (event && phase && phaseGroup) {
+        setSelectedSetChain({
+          eventId: event.id,
+          eventName: event.name,
+          eventSlug: event.slug,
+          phaseId: phase.id,
+          phaseName: phase.name,
+          phaseGroupId: phaseGroup.id,
+          phaseGroupName: phaseGroup.name,
+        });
+      }
 
       // req network
       const errorMessages: string[] = [];
@@ -856,6 +873,11 @@ function Hello() {
     setGettingTournament(true);
     try {
       await window.electron.getTournament(maybeSlug, initial && vlerkMode);
+      if (slug !== maybeSlug) {
+        setSelectedSet(EMPTY_SET);
+        setSelectedSetChain(EMPTY_SELECTED_SET_CHAIN);
+        await window.electron.setSelectedSetChain(0, 0, 0);
+      }
       return true;
     } catch (e: any) {
       showErrorDialog([e.toString()]);
@@ -866,9 +888,6 @@ function Hello() {
   };
 
   // set controls
-  const [selectedSetChain, setSelectedSetChain] = useState(
-    EMPTY_SELECTED_SET_CHAIN,
-  );
   const [selectedChallongeTournament, setSelectedChallongeTournament] =
     useState({ name: '', slug: '' });
   const selectSet = (set: Set) => {
@@ -888,7 +907,7 @@ function Hello() {
     setOverrides(newOverrides);
     setReplays(newReplays);
   };
-  const selectStartggSet = (
+  const selectStartggSet = async (
     set: Set,
     phaseGroupId: number,
     phaseGroupName: string,
@@ -908,6 +927,7 @@ function Hello() {
       phaseGroupId,
       phaseGroupName,
     });
+    await window.electron.setSelectedSetChain(eventId, phaseId, phaseGroupId);
   };
   const selectChallongeSet = (
     set: Set,
@@ -1633,10 +1653,13 @@ function Hello() {
               searchSubstr={searchSubstr}
               tournament={tournament}
               vlerkMode={vlerkMode}
+              selectedEventId={selectedSetChain.eventId}
+              selectedPhaseId={selectedSetChain.phaseId}
+              selectedPhaseGroupId={selectedSetChain.phaseGroupId}
               getEvent={(id: number) => getEvent(id)}
               getPhase={(id: number) => getPhase(id)}
               getPhaseGroup={(id: number) => getPhaseGroup(id)}
-              selectSet={(
+              selectSet={async (
                 set: Set,
                 phaseGroupId: number,
                 phaseGroupName: string,
@@ -1646,7 +1669,7 @@ function Hello() {
                 eventName: string,
                 eventSlug: string,
               ) => {
-                selectStartggSet(
+                await selectStartggSet(
                   set,
                   phaseGroupId,
                   phaseGroupName,
@@ -1988,10 +2011,12 @@ function Hello() {
         latestAppVersion={latestAppVersion}
         gotSettings={gotSettings}
         mode={mode}
-        setMode={(newMode: Mode) => {
+        setMode={async (newMode: Mode) => {
           setMode(newMode);
           setSelectedSet(EMPTY_SET);
           setSelectedSetChain(EMPTY_SELECTED_SET_CHAIN);
+          setSelectedChallongeTournament({ name: '', slug: '' });
+          await window.electron.setSelectedSetChain(0, 0, 0);
         }}
         startggApiKey={startggApiKey}
         setStartggApiKey={setStartggApiKey}

src/renderer/ChallongeView.tsx

@@ -190,7 +190,9 @@ export default function ChallongeView({
               tournament.sets.pendingSets.length === 0 && (
                 <TiebreakerDialog
                   entrants={tournament.entrants}
-                  selectSet={selectSet}
+                  selectSet={async (set: Set) => {
+                    selectSet(set);
+                  }}
                 />
               )}
           </div>

src/renderer/StartggView.tsx

@@ -54,7 +54,7 @@ function SetView({
   entrant1Names: NameWithHighlight[];
   entrant2Names: NameWithHighlight[];
   vlerkMode: boolean;
-  selectSet: () => void;
+  selectSet: () => Promise<void>;
 }) {
   return (
     <ListItemButton
@@ -103,7 +103,7 @@ function PhaseGroupView({
   searchSubstr: string;
   vlerkMode: boolean;
   getPhaseGroup: (id: number) => Promise<void>;
-  selectSet: (set: Set) => void;
+  selectSet: (set: Set) => Promise<void>;
   showError: (error: string) => void;
 }) {
   const [getting, setGetting] = useState(false);
@@ -267,9 +267,7 @@ function PhaseGroupView({
               phaseGroup.sets.pendingSets.length === 0 && (
                 <TiebreakerDialog
                   entrants={phaseGroup.entrants}
-                  selectSet={(set: Set) => {
-                    selectSet(set);
-                  }}
+                  selectSet={(set: Set) => selectSet(set)}
                 />
               )}
           </Block>
@@ -288,6 +286,7 @@ function PhaseView({
   tournamentSlug,
   searchSubstr,
   vlerkMode,
+  selectedPhaseGroupId,
   getPhase,
   getPhaseGroup,
   selectSet,
@@ -301,9 +300,14 @@ function PhaseView({
   tournamentSlug: string;
   searchSubstr: string;
   vlerkMode: boolean;
+  selectedPhaseGroupId: number;
   getPhase: (id: number) => Promise<void>;
   getPhaseGroup: (id: number) => Promise<void>;
-  selectSet: (set: Set, phaseGroupId: number, phaseGroupName: string) => void;
+  selectSet: (
+    set: Set,
+    phaseGroupId: number,
+    phaseGroupName: string,
+  ) => Promise<void>;
   showError: (error: string) => void;
 }) {
   const [getting, setGetting] = useState(false);
@@ -396,7 +400,10 @@ function PhaseView({
             <PhaseGroupView
               key={phaseGroup.id}
               phaseGroup={phaseGroup}
-              initiallyOpen={phase.phaseGroups.length === 1}
+              initiallyOpen={
+                phase.phaseGroups.length === 1 ||
+                phaseGroup.id === selectedPhaseGroupId
+              }
               isStartable={isStartable}
               elevateStartButton={elevateStartButton}
               eventId={eventId}
@@ -424,6 +431,8 @@ function EventView({
   tournamentSlug,
   searchSubstr,
   vlerkMode,
+  selectedPhaseId,
+  selectedPhaseGroupId,
   getEvent,
   getPhase,
   getPhaseGroup,
@@ -436,6 +445,8 @@ function EventView({
   tournamentSlug: string;
   searchSubstr: string;
   vlerkMode: boolean;
+  selectedPhaseId: number;
+  selectedPhaseGroupId: number;
   getEvent: (id: number) => Promise<void>;
   getPhase: (id: number) => Promise<void>;
   getPhaseGroup: (id: number) => Promise<void>;
@@ -445,7 +456,7 @@ function EventView({
     phaseGroupName: string,
     phaseId: number,
     phaseName: string,
-  ) => void;
+  ) => Promise<void>;
   showError: (error: string) => void;
 }) {
   const [getting, setGetting] = useState(false);
@@ -548,13 +559,16 @@ function EventView({
             <PhaseView
               key={phase.id}
               phase={phase}
-              initiallyOpen={event.phases.length === 1}
+              initiallyOpen={
+                event.phases.length === 1 || phase.id === selectedPhaseId
+              }
               isStartable={!event.isOnline}
               elevateStartButton={elevateStartButton}
               eventId={event.id}
               tournamentSlug={tournamentSlug}
               searchSubstr={searchSubstr}
               vlerkMode={vlerkMode}
+              selectedPhaseGroupId={selectedPhaseGroupId}
               getPhase={getPhase}
               getPhaseGroup={getPhaseGroup}
               selectSet={(
@@ -584,6 +598,9 @@ export default function StartggView({
   searchSubstr,
   tournament,
   vlerkMode,
+  selectedEventId,
+  selectedPhaseId,
+  selectedPhaseGroupId,
   getEvent,
   getPhase,
   getPhaseGroup,
@@ -593,6 +610,9 @@ export default function StartggView({
   searchSubstr: string;
   tournament: Tournament;
   vlerkMode: boolean;
+  selectedEventId: number;
+  selectedPhaseId: number;
+  selectedPhaseGroupId: number;
   getEvent: (id: number) => Promise<void>;
   getPhase: (id: number) => Promise<void>;
   getPhaseGroup: (id: number) => Promise<void>;
@@ -605,7 +625,7 @@ export default function StartggView({
     eventId: number,
     eventName: string,
     eventSlug: string,
-  ) => void;
+  ) => Promise<void>;
 }) {
   const [error, setError] = useState('');
   const [errorDialogOpen, setErrorDialogOpen] = useState(false);
@@ -620,11 +640,15 @@ export default function StartggView({
           <EventView
             key={event.id}
             event={event}
-            initiallyOpen={tournament.events.length === 1}
+            initiallyOpen={
+              tournament.events.length === 1 || event.id === selectedEventId
+            }
             elevateStartButton={elevateStartButton}
             tournamentSlug={tournament.slug}
             searchSubstr={searchSubstr}
             vlerkMode={vlerkMode}
+            selectedPhaseId={selectedPhaseId}
+            selectedPhaseGroupId={selectedPhaseGroupId}
             getEvent={getEvent}
             getPhase={getPhase}
             getPhaseGroup={getPhaseGroup}