From 4533e533837f716c8419219cbc12beda24af80cd Mon Sep 17 00:00:00 2001
From: Opaque02 <66582645+Opaque02@users.noreply.github.com>
Date: Sun, 20 Oct 2024 20:59:33 +1000
Subject: [PATCH] Apply suggestions from code review

Moka review changes

Co-authored-by: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com>
---
 src/ui/admin-ui-handler.ts      | 12 ++++++------
 src/ui/form-modal-ui-handler.ts |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/ui/admin-ui-handler.ts b/src/ui/admin-ui-handler.ts
index c59ff0c6dea..53192df3db4 100644
--- a/src/ui/admin-ui-handler.ts
+++ b/src/ui/admin-ui-handler.ts
@@ -165,7 +165,7 @@ export default class AdminUiHandler extends FormModalUiHandler {
   }
 
   // this is used to update the fields' text when loading a new admin ui handler. It uses the adminResult to update the input text fields depending on the adminMode
-  populateFields(adminMode: AdminMode, adminResult: AdminSearchInfo) {
+  private populateFields(adminMode: AdminMode, adminResult: AdminSearchInfo) {
     switch (adminMode) {
     case AdminMode.LINK:
       this.inputs[0].setText(adminResult.username);
@@ -214,7 +214,7 @@ export default class AdminUiHandler extends FormModalUiHandler {
     }
   }
 
-  areFieldsValid(adminMode: AdminMode, service?: string): { error: boolean; errorMessage?: string; } {
+  private areFieldsValid(adminMode: AdminMode, service?: string): { error: boolean; errorMessage?: string; } {
     switch (adminMode) {
     case AdminMode.LINK:
       if (!this.inputs[0].text) { // username missing from link panel
@@ -258,7 +258,7 @@ export default class AdminUiHandler extends FormModalUiHandler {
     };
   }
 
-  convertInputsToAdmin(): AdminSearchInfo {
+  private convertInputsToAdmin(): AdminSearchInfo {
     return {
       username: this.inputs[0]?.node ? this.inputs[0].text : "",
       discordId: this.inputs[1]?.node ? this.inputs[1]?.text : "",
@@ -268,7 +268,7 @@ export default class AdminUiHandler extends FormModalUiHandler {
     };
   }
 
-  async adminSearch(adminSearchResult: AdminSearchInfo) {
+  private async adminSearch(adminSearchResult: AdminSearchInfo) {
     try {
       const adminInfo = await Utils.apiFetch(`admin/account/adminSearch?username=${encodeURIComponent(adminSearchResult.username)}`, true);
       if (!adminInfo.ok) { // error - if adminInfo.status === this.httpUserNotFoundErrorCode that means the username can't be found in the db
@@ -283,7 +283,7 @@ export default class AdminUiHandler extends FormModalUiHandler {
     }
   }
 
-  async adminLinkUnlink(adminSearchResult: AdminSearchInfo, service: string, mode: string) {
+  private async adminLinkUnlink(adminSearchResult: AdminSearchInfo, service: string, mode: string) {
     try {
       const response = await Utils.apiPost(`admin/account/${service}${mode}`, `username=${encodeURIComponent(adminSearchResult.username)}&${service}Id=${encodeURIComponent(service === "discord" ? adminSearchResult.discordId : adminSearchResult.googleId)}`, "application/x-www-form-urlencoded", true);
       if (!response.ok) { // error - if response.status === this.httpUserNotFoundErrorCode that means the username can't be found in the db
@@ -297,7 +297,7 @@ export default class AdminUiHandler extends FormModalUiHandler {
     }
   }
 
-  updateAdminPanelInfo(adminSearchResult: AdminSearchInfo, mode?: AdminMode) {
+  private updateAdminPanelInfo(adminSearchResult: AdminSearchInfo, mode?: AdminMode) {
     mode = mode ?? AdminMode.ADMIN;
     this.scene.ui.setMode(Mode.ADMIN, {
       buttonActions: [
diff --git a/src/ui/form-modal-ui-handler.ts b/src/ui/form-modal-ui-handler.ts
index 9a92804fadb..65ee9f2db10 100644
--- a/src/ui/form-modal-ui-handler.ts
+++ b/src/ui/form-modal-ui-handler.ts
@@ -30,7 +30,8 @@ export abstract class FormModalUiHandler extends ModalUiHandler {
   }
 
   /**
-   * Get all information for each field to display in the modal
+   * Get configuration for all fields that should be part of the modal
+   * Gets used by {@linkcode updateFields} to add the proper text inputs and labels to the view
    * @returns array of {@linkcode InputFieldConfig}
    */
   abstract getInputFieldConfigs(): InputFieldConfig[];
@@ -65,7 +66,7 @@ export abstract class FormModalUiHandler extends ModalUiHandler {
     this.modalContainer.add(this.errorMessage);
   }
 
-  updateFields(fieldsConfig: InputFieldConfig[], hasTitle: boolean) {
+  protected updateFields(fieldsConfig: InputFieldConfig[], hasTitle: boolean) {
     this.inputContainers = [];
     this.inputs = [];
     this.formLabels = [];
@@ -90,7 +91,7 @@ export abstract class FormModalUiHandler extends ModalUiHandler {
       inputContainer.add(input);
 
       this.inputContainers.push(inputContainer);
-      this.modalContainer.add(this.inputContainers[this.inputContainers.length - 1]);
+      this.modalContainer.add(inputContainer);
 
       this.inputs.push(input);
     });