Update request redeploy querying all incidents

CrisisCleanup · Aug 15, 2024 · e802df4 · e802df4
1 parent ac0a42f
commit e802df4
Show file tree

Hide file tree

Showing 23 changed files with 299 additions and 166 deletions.
diff --git a/app/src/main/java/com/crisiscleanup/CrisisCleanupTutorialViewTracker.kt b/app/src/main/java/com/crisiscleanup/CrisisCleanupTutorialViewTracker.kt
@@ -11,12 +11,11 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class CrisisCleanupTutorialViewTracker @Inject constructor(
-) : TutorialViewTracker {
+class CrisisCleanupTutorialViewTracker @Inject constructor() : TutorialViewTracker {
     override val viewSizePositionLookup =
         SnapshotStateMap<TutorialViewId, LayoutSizePosition>().also {
             it[AppNavBar] = LayoutSizePosition()
             it[IncidentSelectDropdown] = LayoutSizePosition()
             it[AccountToggle] = LayoutSizePosition()
         }
-}
+}
diff --git a/app/src/main/java/com/crisiscleanup/ui/CrisisCleanupApp.kt b/app/src/main/java/com/crisiscleanup/ui/CrisisCleanupApp.kt
@@ -457,4 +457,3 @@ private fun ExpiredAccountAlert(
         }
     }
 }
-
diff --git a/app/src/main/java/com/crisiscleanup/ui/TutorialGraphics.kt b/app/src/main/java/com/crisiscleanup/ui/TutorialGraphics.kt
@@ -174,11 +174,13 @@ private fun DrawScope.spotlightStepForwardOffset(
     viewSizePosition: LayoutSizePosition,
 ): Offset {
     val center = viewSizePosition.position.y + viewSizePosition.size.height * 0.5f
-    val y = size.height * (if (center > size.height * 0.5f) {
-        0.2f
-    } else {
-        0.8f
-    })
+    val y = size.height * (
+        if (center > size.height * 0.5f) {
+            0.2f
+        } else {
+            0.8f
+        }
+        )
     val x = viewSizePosition.position.x + if (isHorizontalBar) {
         32f
     } else {
@@ -229,22 +231,24 @@ private fun DrawScope.menuTutorialDynamicContent(
 
     val lineX = size.width * 0.5f
     val lineStartY =
-        instructionOffset.y + (if (isSpotlightCenterAbove) {
-            -16f
-        } else {
-            val instructionConstraints = Constraints(
-                maxWidth = (size.width - instructionOffset.x).toInt(),
-            )
-            val textLayout = textMeasurer.measure(
-                stepInstruction,
-                instructionStyle,
-                overflow = TextOverflow.Visible,
-                constraints = instructionConstraints,
-            )
-            val textSize = textLayout.size
+        instructionOffset.y + (
+            if (isSpotlightCenterAbove) {
+                -16f
+            } else {
+                val instructionConstraints = Constraints(
+                    maxWidth = (size.width - instructionOffset.x).toInt(),
+                )
+                val textLayout = textMeasurer.measure(
+                    stepInstruction,
+                    instructionStyle,
+                    overflow = TextOverflow.Visible,
+                    constraints = instructionConstraints,
+                )
+                val textSize = textLayout.size
 
-            textSize.height.toFloat() + 16f
-        })
+                textSize.height.toFloat() + 16f
+            }
+            )
     val lineStart = Offset(lineX, lineStartY)
     val lineEndY =
         sizeOffset.topLeft.y + (if (isSpotlightCenterAbove) sizeOffset.size.height + 32f else -32f)
@@ -275,11 +279,11 @@ private fun DrawScope.spotlightAboveStepForwardOffset(
         Offset(if (isHorizontalBar) 0f else 32f, 0f),
     )
     val x = referencePosition.position.x +
-            if (isHorizontalBar) {
-                32f
-            } else {
-                referencePosition.size.width * 0.2f
-            }
+        if (isHorizontalBar) {
+            32f
+        } else {
+            referencePosition.size.width * 0.2f
+        }
     val y = size.height * 0.6f
     return Offset(x, y)
 }

diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/TutorialDirector.kt b/core/common/src/main/java/com/crisiscleanup/core/common/TutorialDirector.kt
@@ -24,13 +24,13 @@ enum class TutorialStep {
     AccountInfo,
     ProvideAppFeedback,
     IncidentSelect,
-    End
+    End,
 }
 
 @Qualifier
 @Retention(RUNTIME)
 annotation class Tutorials(val director: CrisisCleanupTutorialDirectors)
 
 enum class CrisisCleanupTutorialDirectors {
-    Menu
+    Menu,
 }
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/repository/IncidentsRepository.kt b/core/data/src/main/java/com/crisiscleanup/core/data/repository/IncidentsRepository.kt
@@ -18,6 +18,7 @@ interface IncidentsRepository {
 
     suspend fun getIncident(id: Long, loadFormFields: Boolean = false): Incident?
     suspend fun getIncidents(startAt: Instant): List<Incident>
+    suspend fun getIncidentsList(): List<IncidentIdNameType>
 
     fun streamIncident(id: Long): Flow<Incident?>
 

diff --git a/...a/src/main/java/com/crisiscleanup/core/data/repository/OfflineFirstIncidentsRepository.kt b/...a/src/main/java/com/crisiscleanup/core/data/repository/OfflineFirstIncidentsRepository.kt
@@ -20,6 +20,7 @@ import com.crisiscleanup.core.database.model.asExternalModel
 import com.crisiscleanup.core.datastore.LocalAppPreferencesDataSource
 import com.crisiscleanup.core.model.data.INCIDENT_ORGANIZATIONS_STABLE_MODEL_BUILD_VERSION
 import com.crisiscleanup.core.model.data.Incident
+import com.crisiscleanup.core.model.data.IncidentIdNameType
 import com.crisiscleanup.core.network.CrisisCleanupNetworkDataSource
 import com.crisiscleanup.core.network.model.NetworkIncident
 import com.crisiscleanup.core.network.model.NetworkIncidentLocation
@@ -83,6 +84,23 @@ class OfflineFirstIncidentsRepository @Inject constructor(
             .map(PopulatedIncident::asExternalModel)
     }
 
+    override suspend fun getIncidentsList(): List<IncidentIdNameType> {
+        try {
+            return networkDataSource.getIncidentsList()
+                .map {
+                    IncidentIdNameType(
+                        it.id,
+                        it.name,
+                        it.shortName,
+                        disasterLiteral = it.type,
+                    )
+                }
+        } catch (e: Exception) {
+            logger.logException(e)
+        }
+        return emptyList()
+    }
+
     override fun streamIncident(id: Long) =
         incidentDao.streamFormFieldsIncident(id).mapLatest { it?.asExternalModel() }
 

diff --git a/...system/src/main/java/com/crisiscleanup/core/designsystem/component/ListOptionsDropdown.kt b/...system/src/main/java/com/crisiscleanup/core/designsystem/component/ListOptionsDropdown.kt
@@ -32,6 +32,7 @@ fun ListOptionsDropdown(
     Row(
         modifier
             .actionHeight()
+            // TODO Common dimensions
             .roundedOutline(radius = 3.dp)
             .clickable(
                 onClick = onToggleDropdown,

diff --git a/...designsystem/src/main/java/com/crisiscleanup/core/designsystem/icon/CrisisCleanupIcons.kt b/...designsystem/src/main/java/com/crisiscleanup/core/designsystem/icon/CrisisCleanupIcons.kt
@@ -39,6 +39,7 @@ import androidx.compose.material.icons.filled.QuestionMark
 import androidx.compose.material.icons.filled.Remove
 import androidx.compose.material.icons.filled.Rotate90DegreesCcw
 import androidx.compose.material.icons.filled.Rotate90DegreesCw
+import androidx.compose.material.icons.filled.Schedule
 import androidx.compose.material.icons.filled.SentimentNeutral
 import androidx.compose.material.icons.filled.UnfoldMore
 import androidx.compose.material.icons.filled.Visibility
@@ -88,6 +89,7 @@ object CrisisCleanupIcons {
     val MyLocation = icons.MyLocation
     val Organization = icons.Domain
     val Person = icons.Person
+    val PendingRequestRedeploy = icons.Schedule
     val Phone = icons.Phone
     val PhotoGrid = icons.PhotoLibrary
     val Play = icons.PlayArrow

diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/Color.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/Color.kt
@@ -37,6 +37,7 @@ val primaryBlueOneTenthColor = primaryBlueColor.copy(alpha = 0.1f)
 val primaryRedColor = Color(0xFFED4747)
 val primaryOrangeColor = Color(0xFFF79820)
 val devActionColor = Color(0xFFF50057)
+val green600 = Color(0xFF43A047)
 internal val crisisCleanupYellow100 = Color(0xFFFFDC68)
 internal val crisisCleanupYellow100HalfTransparent = crisisCleanupYellow100.copy(alpha = 0.5f)
 val survivorNoteColor = crisisCleanupYellow100HalfTransparent

diff --git a/core/model/src/main/java/com/crisiscleanup/core/model/data/CrisisCleanupList.kt b/core/model/src/main/java/com/crisiscleanup/core/model/data/CrisisCleanupList.kt
@@ -33,7 +33,7 @@ val EmptyList = CrisisCleanupList(
     shared = ListShare.Private,
     permission = ListPermission.Read,
     incidentId = EmptyIncident.id,
-    incident = IncidentIdNameType(id = EmptyIncident.id, "", "", ""),
+    incident = EmptyIncidentIdNameType,
 )
 
 enum class ListModel(val literal: String) {

diff --git a/core/model/src/main/java/com/crisiscleanup/core/model/data/Incident.kt b/core/model/src/main/java/com/crisiscleanup/core/model/data/Incident.kt
@@ -78,3 +78,13 @@ data class IncidentIdNameType(
     val disasterLiteral: String,
     val disaster: Disaster = disasterFromLiteral(disasterLiteral),
 )
+
+val Incident.idNameType: IncidentIdNameType
+    get() = IncidentIdNameType(
+        id,
+        name,
+        shortName,
+        disasterLiteral,
+    )
+
+val EmptyIncidentIdNameType = EmptyIncident.idNameType
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/CrisisCleanupNetworkDataSource.kt b/core/network/src/main/java/com/crisiscleanup/core/network/CrisisCleanupNetworkDataSource.kt
@@ -14,6 +14,7 @@ import com.crisiscleanup.core.network.model.NetworkLocation
 import com.crisiscleanup.core.network.model.NetworkOrganizationShort
 import com.crisiscleanup.core.network.model.NetworkOrganizationsResult
 import com.crisiscleanup.core.network.model.NetworkPersonContact
+import com.crisiscleanup.core.network.model.NetworkShortIncident
 import com.crisiscleanup.core.network.model.NetworkTeamResult
 import com.crisiscleanup.core.network.model.NetworkUserProfile
 import com.crisiscleanup.core.network.model.NetworkWorkTypeRequest
@@ -39,6 +40,12 @@ interface CrisisCleanupNetworkDataSource {
         after: Instant? = null,
     ): List<NetworkIncident>
 
+    suspend fun getIncidentsList(
+        fields: List<String> = listOf("id", "name", "short_name", "incident_type"),
+        limit: Int = 250,
+        ordering: String = "-start_at",
+    ): List<NetworkShortIncident>
+
     suspend fun getIncidentLocations(
         locationIds: List<Long>,
     ): List<NetworkLocation>

diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkIncident.kt b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkIncident.kt
@@ -99,3 +99,20 @@ data class NetworkIncidentFormField(
         val name: String,
     )
 }
+
+@Serializable
+data class NetworkIncidentsListResult(
+    val errors: List<NetworkCrisisCleanupApiError>? = null,
+    val count: Int? = null,
+    val results: List<NetworkShortIncident>? = null,
+)
+
+@Serializable
+data class NetworkShortIncident(
+    val id: Long,
+    val name: String,
+    @SerialName("short_name")
+    val shortName: String,
+    @SerialName("incident_type")
+    val type: String,
+)
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/DataApiClient.kt b/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/DataApiClient.kt
@@ -7,6 +7,7 @@ import com.crisiscleanup.core.network.model.NetworkCountResult
 import com.crisiscleanup.core.network.model.NetworkFlagsFormData
 import com.crisiscleanup.core.network.model.NetworkFlagsFormDataResult
 import com.crisiscleanup.core.network.model.NetworkIncidentResult
+import com.crisiscleanup.core.network.model.NetworkIncidentsListResult
 import com.crisiscleanup.core.network.model.NetworkIncidentsResult
 import com.crisiscleanup.core.network.model.NetworkLanguageTranslationResult
 import com.crisiscleanup.core.network.model.NetworkLanguagesResult
@@ -76,6 +77,16 @@ private interface DataSourceApi {
         after: Instant?,
     ): NetworkIncidentsResult
 
+    @GET("incidents_list")
+    suspend fun getIncidentsList(
+        @Query("fields")
+        fields: String,
+        @Query("limit")
+        limit: Int,
+        @Query("sort")
+        ordering: String,
+    ): NetworkIncidentsListResult
+
     @TokenAuthenticationHeader
     @GET("locations")
     suspend fun getLocations(
@@ -330,6 +341,16 @@ class DataApiClient @Inject constructor(
             it.results ?: emptyList()
         }
 
+    override suspend fun getIncidentsList(
+        fields: List<String>,
+        limit: Int,
+        ordering: String,
+    ) = networkApi.getIncidentsList(fields.joinToString(","), limit, ordering)
+        .let {
+            it.errors?.tryThrowException()
+            it.results ?: emptyList()
+        }
+
     override suspend fun getIncidentLocations(locationIds: List<Long>) =
         networkApi.getLocations(locationIds.joinToString(","), locationIds.size)
             .let {

diff --git a/core/ui/src/main/java/com/crisiscleanup/core/ui/LayoutSizePosition.kt b/core/ui/src/main/java/com/crisiscleanup/core/ui/LayoutSizePosition.kt
@@ -11,4 +11,4 @@ data class LayoutSizePosition(
 )
 
 val LayoutCoordinates.sizePosition: LayoutSizePosition
-    get() = LayoutSizePosition(size, positionInRoot())
+    get() = LayoutSizePosition(size, positionInRoot())
diff --git a/core/ui/src/main/java/com/crisiscleanup/core/ui/TutorialViewTracker.kt b/core/ui/src/main/java/com/crisiscleanup/core/ui/TutorialViewTracker.kt
@@ -5,4 +5,4 @@ import com.crisiscleanup.core.model.data.TutorialViewId
 
 interface TutorialViewTracker {
     val viewSizePositionLookup: SnapshotStateMap<TutorialViewId, LayoutSizePosition>
-}
+}
diff --git a/...re/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/QueryIncidentsManager.kt b/...re/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/QueryIncidentsManager.kt
@@ -5,6 +5,7 @@ import com.crisiscleanup.core.common.throttleLatest
 import com.crisiscleanup.core.data.repository.IncidentsRepository
 import com.crisiscleanup.core.model.data.Incident
 import com.crisiscleanup.core.model.data.IncidentIdNameType
+import com.crisiscleanup.core.model.data.idNameType
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -42,12 +43,9 @@ class QueryIncidentsManager(
         private set
 
     private val allIncidentsShort = allIncidents.mapLatest {
-        val all = it.map { incident ->
-            with(incident) {
-                IncidentIdNameType(id, name, shortName, disasterLiteral)
-            }
-        }
+        val all = it.map(Incident::idNameType)
 
+        // TODO Redesign and separate state
         isLoadingAll.value = false
 
         all

diff --git a/feature/menu/src/main/java/com/crisiscleanup/feature/menu/MenuTutorialDirector.kt b/feature/menu/src/main/java/com/crisiscleanup/feature/menu/MenuTutorialDirector.kt
@@ -34,4 +34,4 @@ class MenuTutorialDirector @Inject constructor() : TutorialDirector {
         tutorialStep.value = nextStep
         return nextStep != TutorialStep.End
     }
-}
+}
diff --git a/feature/menu/src/main/java/com/crisiscleanup/feature/menu/di/MenuModule.kt b/feature/menu/src/main/java/com/crisiscleanup/feature/menu/di/MenuModule.kt
@@ -12,11 +12,11 @@ import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
-interface DataModule {
+interface MenuModule {
     @Singleton
     @Binds
     @Tutorials(CrisisCleanupTutorialDirectors.Menu)
     fun bindsTutorialDirector(
         director: MenuTutorialDirector,
     ): TutorialDirector
-}
+}