Merge pull request #23 from DatepollSystems/WR-329-auto-select

WR-329: Auto select organization and event when there is only one

Author: dev-Fabi

src/main/kotlin/org/datepollsystems/waiterrobot/mediator/core/AbstractViewModel.kt

@@ -2,6 +2,7 @@ package org.datepollsystems.waiterrobot.mediator.core
 
 import dev.icerock.moko.mvvm.viewmodel.ViewModel
 import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -46,8 +47,8 @@ abstract class AbstractViewModel<T : State<T>>(
         _stateFlow.update(reducer)
     }
 
-    fun <T> inVmScope(block: suspend () -> T) {
-        viewModelScope.launch(SupervisorJob() + exceptionHandler) {
+    fun <T> inVmScope(block: suspend () -> T): Job {
+        return viewModelScope.launch(SupervisorJob() + exceptionHandler) {
             block()
         }
     }
@@ -60,7 +61,7 @@ abstract class AbstractViewModel<T : State<T>>(
         withScreenState(ScreenState.Error(errorTitle, errorMsg, dismiss))
     }
 
-    private fun dismissError() = inVmScope {
+    private fun dismissError() {
         reduce {
             withScreenState(ScreenState.Idle)
         }

src/main/kotlin/org/datepollsystems/waiterrobot/mediator/ui/common/CenteredText.kt

@@ -0,0 +1,18 @@
+package org.datepollsystems.waiterrobot.mediator.ui.common
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+
+@Composable
+fun CenteredText(text: String) {
+    Box(
+        modifier = Modifier.fillMaxSize(),
+        contentAlignment = Alignment.Center
+    ) {
+        Text(text)
+    }
+}

src/main/kotlin/org/datepollsystems/waiterrobot/mediator/ui/configurePrinters/ConfigurePrintersScreen.kt

@@ -15,6 +15,7 @@ import androidx.compose.ui.unit.dp
 import org.datepollsystems.waiterrobot.mediator.App
 import org.datepollsystems.waiterrobot.mediator.data.api.dto.GetPrinterDto
 import org.datepollsystems.waiterrobot.mediator.printer.LocalPrinterInfo
+import org.datepollsystems.waiterrobot.mediator.ui.common.CenteredText
 import org.datepollsystems.waiterrobot.mediator.ui.common.DropDownInput
 import org.datepollsystems.waiterrobot.mediator.ui.common.LoadableScreen
 import org.datepollsystems.waiterrobot.mediator.ui.common.SelectedEnvironmentInfo
@@ -163,6 +164,10 @@ fun ConfigurePrintersScreen(vm: ConfigurePrintersViewModel) {
                         }
                     }
                 }
+            } else if (state.selectedOrganisation == null) {
+                CenteredText("Please select an Organization.")
+            } else if (state.selectedEvent == null) {
+                CenteredText("Please select an Event.")
             }
         }
     }

src/main/kotlin/org/datepollsystems/waiterrobot/mediator/ui/configurePrinters/ConfigurePrintersViewModel.kt

@@ -29,13 +29,12 @@ class ConfigurePrintersViewModel(
     init {
         val initConfig = MediatorConfiguration.createFromStore()
         inVmScope {
-            val organisations = loadUserOrganisations()
+            loadUserOrganisations(
+                selectId = initConfig?.selectedOrganisationId,
+                selectEventId = initConfig?.selectedEventId
+            )
             if (initConfig != null) {
-                val selectedOrg = organisations.find { it.id == initConfig.selectedOrganisationId }
-
-                val events = if (selectedOrg != null) loadOrganisationEvents(selectedOrg.id) else null
-                val selectedEvent = events?.find { it.id == initConfig.selectedEventId }
-
+                val selectedEvent = state.value.selectedEvent
                 val bePrinters = if (selectedEvent != null) loadEventPrinters(selectedEvent.id) else null
                 val backendMap = bePrinters?.associateBy(GetPrinterDto::id) ?: emptyMap()
                 val localIds = PrinterDiscoverService.localPrinters.map(LocalPrinterInfo::localId)
@@ -56,15 +55,10 @@ class ConfigurePrintersViewModel(
                     emptyList()
                 }
 
-                val pairedBackendPrinterIds =
-                    initConfig.printerPairings.map(MediatorConfiguration.PrinterPairing::backendPrinterId).toSet()
+                val pairedBackendPrinterIds = pairings.map { it.bePrinter.id }.toSet()
                 reduce {
                     copy(
                         screenState = ScreenState.Idle,
-                        availableOrganisations = organisations,
-                        availableEvents = events,
-                        selectedOrganisation = selectedOrg,
-                        selectedEvent = selectedEvent,
                         pairings = pairings,
                         localPrinters = PrinterDiscoverService.localPrinters.toList(),
                         unPairedBackendPrinters = bePrinters?.filter { it.id !in pairedBackendPrinterIds }
@@ -74,27 +68,31 @@ class ConfigurePrintersViewModel(
                 reduce {
                     copy(
                         screenState = ScreenState.Idle,
-                        availableOrganisations = organisations,
                         localPrinters = PrinterDiscoverService.localPrinters.toList(),
                     )
                 }
             }
         }
     }
 
-    private suspend fun loadUserOrganisations(): List<GetOrganisationDto> {
+    private suspend fun loadUserOrganisations(selectId: ID? = null, selectEventId: ID? = null) {
         val organisations = organisationApi.getUserOrganisations()
         reduce { copy(availableOrganisations = organisations) }
-        return organisations
+        val organisationToSelect = organisations.singleOrNull()
+            ?: if (selectId != null) organisations.find { it.id == selectId } else null
+        if (organisationToSelect != null) changeOrganisation(organisationToSelect, selectEventId).join()
     }
 
     private suspend fun loadOrganisationEvents(
-        organisationId: ID = state.value.selectedOrganisation!!.id
-    ): List<GetEventDto> {
+        organisationId: ID = state.value.selectedOrganisation!!.id,
+        selectId: ID? = null
+    ) {
         // TODO handle organization not set
         val events = eventApi.getOrganisationEvents(organisationId)
         reduce { copy(screenState = ScreenState.Idle, availableEvents = events) }
-        return events
+        val eventToSelect = events.singleOrNull()
+            ?: if (selectId != null) events.find { it.id == selectId } else null
+        if (eventToSelect != null) changeEvent(eventToSelect).join()
     }
 
     private suspend fun loadEventPrinters(eventId: ID = state.value.selectedEvent!!.id): List<GetPrinterDto> {
@@ -133,7 +131,7 @@ class ConfigurePrintersViewModel(
         }
     }
 
-    fun changeOrganisation(organisation: GetOrganisationDto) = inVmScope {
+    fun changeOrganisation(organisation: GetOrganisationDto, selectEventId: ID? = null) = inVmScope {
         reduce {
             copy(
                 selectedOrganisation = organisation,
@@ -144,7 +142,7 @@ class ConfigurePrintersViewModel(
                 pairings = emptyList()
             )
         }
-        loadOrganisationEvents()
+        loadOrganisationEvents(selectId = selectEventId)
     }
 
     fun changeEvent(event: GetEventDto) = inVmScope {