@shaykec/app-agent 1.0.4 → 1.0.6

package/templates/android/DashTemplate/app/src/main/kotlin/com/appship/dash/data/local/MetricEntity.kt

@@ -0,0 +1,52 @@
+package com.appship.dash.data.local
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.appship.dash.data.DataPoint
+import com.appship.dash.data.Metric
+import com.appship.dash.data.Trend
+import com.google.gson.Gson
+
+/**
+ * Room entity for Metric persistence.
+ */
+@Entity(tableName = "metrics")
+data class MetricEntity(
+    @PrimaryKey val id: String,
+    val name: String = "",
+    val value: Double = 0.0,
+    val unit: String = "",
+    val trend: String = "NEUTRAL",
+    val changePercent: Double = 0.0,
+    val sparklineJson: String = "[]"
+) {
+    fun toMetric(): Metric = Metric(
+        id = id,
+        name = name,
+        value = value,
+        unit = unit,
+        trend = Trend.valueOf(trend),
+        changePercent = changePercent,
+        sparklineData = parseDataPoints()
+    )
+
+    private fun parseDataPoints(): List<DataPoint> {
+        return try {
+            Gson().fromJson(sparklineJson, Array<DataPoint>::class.java)?.toList() ?: emptyList()
+        } catch (_: Exception) {
+            emptyList()
+        }
+    }
+
+    companion object {
+        fun fromMetric(metric: Metric): MetricEntity = MetricEntity(
+            id = metric.id,
+            name = metric.name,
+            value = metric.value,
+            unit = metric.unit,
+            trend = metric.trend.name,
+            changePercent = metric.changePercent,
+            sparklineJson = Gson().toJson(metric.sparklineData)
+        )
+    }
+}

package/templates/android/DashTemplate/app/src/main/kotlin/com/appship/dash/data/local/ReportEntity.kt

@@ -0,0 +1,48 @@
+package com.appship.dash.data.local
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.appship.dash.data.Metric
+import com.appship.dash.data.Report
+import com.appship.dash.data.TimeRange
+import com.google.gson.Gson
+import java.util.Date
+
+/**
+ * Room entity for Report persistence.
+ */
+@Entity(tableName = "reports")
+data class ReportEntity(
+    @PrimaryKey val id: String,
+    val title: String = "",
+    val dateRange: String = "TODAY",
+    val metricsJson: String = "[]",
+    val createdAtMillis: Long = System.currentTimeMillis()
+) {
+    fun toReport(metrics: List<Metric>): Report = Report(
+        id = id,
+        title = title,
+        dateRange = TimeRange.valueOf(dateRange),
+        metrics = parseMetrics(metrics),
+        createdAt = Date(createdAtMillis)
+    )
+
+    private fun parseMetrics(availableMetrics: List<Metric>): List<Metric> {
+        val metricIds = try {
+            Gson().fromJson(metricsJson, Array<String>::class.java)?.toList() ?: emptyList()
+        } catch (_: Exception) {
+            emptyList()
+        }
+        return metricIds.mapNotNull { id -> availableMetrics.firstOrNull { it.id == id } }
+    }
+
+    companion object {
+        fun fromReport(report: Report): ReportEntity = ReportEntity(
+            id = report.id,
+            title = report.title,
+            dateRange = report.dateRange.name,
+            metricsJson = Gson().toJson(report.metrics.map { it.id }),
+            createdAtMillis = report.createdAt.time
+        )
+    }
+}

package/templates/android/DashTemplate/app/src/main/kotlin/com/appship/dash/data/local/WidgetEntity.kt

@@ -0,0 +1,97 @@
+package com.appship.dash.data.local
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.appship.dash.data.*
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+
+/**
+ * Room entity for Widget persistence.
+ */
+@Entity(tableName = "widgets")
+data class WidgetEntity(
+    @PrimaryKey val id: String,
+    val title: String = "",
+    val type: String = "KPI",
+    val size: String = "MEDIUM",
+    val dataJson: String = "{}",
+    val positionRow: Int = 0,
+    val positionColumn: Int = 0
+) {
+    fun toWidget(metrics: List<Metric>, dataPoints: List<DataPoint>): Widget = Widget(
+        id = id,
+        title = title,
+        type = WidgetType.valueOf(type),
+        size = WidgetSize.valueOf(size),
+        data = decodeWidgetData(metrics, dataPoints),
+        position = GridPosition(positionRow, positionColumn)
+    )
+
+    private fun decodeWidgetData(metrics: List<Metric>, dataPoints: List<DataPoint>): WidgetData {
+        val dict: Map<String, Any> = try {
+            Gson().fromJson<Map<String, Any>>(dataJson, object : TypeToken<Map<String, Any>>() {}.type) ?: emptyMap()
+        } catch (_: Exception) {
+            emptyMap()
+        }
+
+        return when (type) {
+            "KPI" -> {
+                val metricId = dict["metricId"] as? String
+                val metric = metricId?.let { id -> metrics.firstOrNull { it.id == id } }
+                    ?: Metric(name = "", value = 0.0)
+                WidgetData.KPI(metric)
+            }
+            "CHART" -> {
+                val ids = (dict["dataPointIds"] as? List<*>)?.mapNotNull { it as? String } ?: emptyList()
+                val points = ids.mapNotNull { id -> dataPoints.firstOrNull { it.id == id } }
+                WidgetData.Chart(points)
+            }
+            "SPARKLINE" -> {
+                val ids = (dict["dataPointIds"] as? List<*>)?.mapNotNull { it as? String } ?: emptyList()
+                val points = ids.mapNotNull { id -> dataPoints.firstOrNull { it.id == id } }
+                WidgetData.Sparkline(points)
+            }
+            "TABLE" -> {
+                val ids = (dict["metricIds"] as? List<*>)?.mapNotNull { it as? String } ?: emptyList()
+                val widgetMetrics = ids.mapNotNull { id -> metrics.firstOrNull { it.id == id } }
+                WidgetData.Table(widgetMetrics)
+            }
+            "GAUGE" -> {
+                val value = (dict["value"] as? Number)?.toDouble() ?: 0.0
+                val min = (dict["min"] as? Number)?.toDouble() ?: 0.0
+                val max = (dict["max"] as? Number)?.toDouble() ?: 100.0
+                WidgetData.Gauge(value, min, max)
+            }
+            else -> WidgetData.KPI(Metric(name = "", value = 0.0))
+        }
+    }
+
+    companion object {
+        fun fromWidget(widget: Widget): WidgetEntity = WidgetEntity(
+            id = widget.id,
+            title = widget.title,
+            type = widget.type.name,
+            size = widget.size.name,
+            dataJson = encodeWidgetData(widget.data),
+            positionRow = widget.position.row,
+            positionColumn = widget.position.column
+        )
+
+        private fun encodeWidgetData(data: WidgetData): String {
+            val dict = mutableMapOf<String, Any>()
+            when (data) {
+                is WidgetData.KPI -> dict["metricId"] = data.metric.id
+                is WidgetData.Chart -> dict["dataPointIds"] = data.dataPoints.map { it.id }
+                is WidgetData.Sparkline -> dict["dataPointIds"] = data.dataPoints.map { it.id }
+                is WidgetData.Table -> dict["metricIds"] = data.metrics.map { it.id }
+                is WidgetData.Gauge -> {
+                    dict["value"] = data.value
+                    dict["min"] = data.min
+                    dict["max"] = data.max
+                }
+            }
+            return Gson().toJson(dict)
+        }
+    }
+}

package/templates/android/DashTemplate/app/src/main/kotlin/com/appship/dash/features/alerts/AlertsScreen.kt

@@ -11,29 +11,44 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import com.appship.dash.data.Alert
-import com.appship.dash.mock.MockDataProvider
+import com.appship.dash.data.DataSourceResolver
+import com.appship.dash.core.components.EmptyStateView
+import com.appship.dash.core.components.EmptyStatePresets
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AlertsScreen(modifier: Modifier = Modifier) {
-    val alerts by MockDataProvider.alerts.collectAsState()
+    val repository = remember { DataSourceResolver.repository }
+    val alerts by repository.alerts.collectAsState()
     
     Scaffold(
         topBar = {
             TopAppBar(title = { Text("Alerts") })
         }
     ) { paddingValues ->
-        LazyColumn(
-            modifier = modifier.padding(paddingValues),
-            contentPadding = PaddingValues(16.dp),
-            verticalArrangement = Arrangement.spacedBy(8.dp)
-        ) {
-            itemsIndexed(alerts) { index, alert ->
-                AlertRow(
-                    alert = alert,
-                    index = index,
-                    onDismiss = { MockDataProvider.dismissAlert(alert) }
-                )
+        if (alerts.isEmpty()) {
+            EmptyStateView(
+                config = EmptyStatePresets.noItems(
+                    message = "No alerts",
+                    onAdd = null
+                ),
+                modifier = modifier
+                    .fillMaxSize()
+                    .padding(paddingValues)
+            )
+        } else {
+            LazyColumn(
+                modifier = modifier.padding(paddingValues),
+                contentPadding = PaddingValues(16.dp),
+                verticalArrangement = Arrangement.spacedBy(8.dp)
+            ) {
+                itemsIndexed(alerts) { index, alert ->
+                    AlertRow(
+                        alert = alert,
+                        index = index,
+                        onDismiss = { repository.dismissAlert(alert) }
+                    )
+                }
             }
         }
     }

package/templates/android/DashTemplate/app/src/main/kotlin/com/appship/dash/features/dashboard/DashboardScreen.kt

@@ -14,13 +14,16 @@ import androidx.compose.ui.unit.dp
 import com.appship.dash.AppConfig
 import com.appship.dash.core.components.WidgetCard
 import com.appship.dash.core.components.TimeRangePicker
+import com.appship.dash.core.components.EmptyStateView
+import com.appship.dash.core.components.EmptyStatePresets
 import com.appship.dash.data.TimeRange
-import com.appship.dash.mock.MockDataProvider
+import com.appship.dash.data.DataSourceResolver
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun DashboardScreen(modifier: Modifier = Modifier) {
-    val widgets by MockDataProvider.widgets.collectAsState()
+    val repository = remember { DataSourceResolver.repository }
+    val widgets by repository.widgets.collectAsState()
     var selectedTimeRange by remember { mutableStateOf(TimeRange.TODAY) }
     var isRefreshing by remember { mutableStateOf(false) }
     
@@ -55,17 +58,26 @@ fun DashboardScreen(modifier: Modifier = Modifier) {
             )
             
             // Widget Grid
-            LazyVerticalGrid(
-                columns = GridCells.Fixed(3),
-                contentPadding = PaddingValues(16.dp),
-                horizontalArrangement = Arrangement.spacedBy(16.dp),
-                verticalArrangement = Arrangement.spacedBy(16.dp)
-            ) {
-                itemsIndexed(widgets) { index, widget ->
-                    WidgetCard(
-                        widget = widget,
-                        modifier = Modifier.testTag("dashboard_widget_${index}_card")
+            if (widgets.isEmpty()) {
+                EmptyStateView(
+                    config = EmptyStatePresets.noItems(
+                        message = "No widgets configured yet",
+                        onAdd = null
                     )
+                )
+            } else {
+                LazyVerticalGrid(
+                    columns = GridCells.Fixed(3),
+                    contentPadding = PaddingValues(16.dp),
+                    horizontalArrangement = Arrangement.spacedBy(16.dp),
+                    verticalArrangement = Arrangement.spacedBy(16.dp)
+                ) {
+                    itemsIndexed(widgets) { index, widget ->
+                        WidgetCard(
+                            widget = widget,
+                            modifier = Modifier.testTag("dashboard_widget_${index}_card")
+                        )
+                    }
                 }
             }
         }

package/templates/android/DashTemplate/app/src/main/kotlin/com/appship/dash/features/datasources/DataSourcesScreen.kt

@@ -7,34 +7,49 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.appship.dash.mock.MockDataProvider
+import com.appship.dash.data.DataSourceResolver
+import com.appship.dash.core.components.EmptyStateView
+import com.appship.dash.core.components.EmptyStatePresets
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun DataSourcesScreen(modifier: Modifier = Modifier) {
-    val dataSources by MockDataProvider.dataSources.collectAsState()
+    val repository = remember { DataSourceResolver.repository }
+    val dataSources by repository.dataSources.collectAsState()
     
     Scaffold(
         topBar = {
             TopAppBar(title = { Text("Data Sources") })
         }
     ) { paddingValues ->
-        LazyColumn(
-            modifier = modifier.padding(paddingValues),
-            contentPadding = PaddingValues(16.dp),
-            verticalArrangement = Arrangement.spacedBy(8.dp)
-        ) {
-            items(dataSources) { dataSource ->
-                Card(modifier = Modifier.fillMaxWidth()) {
-                    Column(modifier = Modifier.padding(16.dp)) {
-                        Text(
-                            text = dataSource.name,
-                            style = MaterialTheme.typography.titleMedium
-                        )
-                        Text(
-                            text = dataSource.status.name,
-                            style = MaterialTheme.typography.bodyMedium
-                        )
+        if (dataSources.isEmpty()) {
+            EmptyStateView(
+                config = EmptyStatePresets.noItems(
+                    message = "No data sources configured yet",
+                    onAdd = null
+                ),
+                modifier = modifier
+                    .fillMaxSize()
+                    .padding(paddingValues)
+            )
+        } else {
+            LazyColumn(
+                modifier = modifier.padding(paddingValues),
+                contentPadding = PaddingValues(16.dp),
+                verticalArrangement = Arrangement.spacedBy(8.dp)
+            ) {
+                items(dataSources) { dataSource ->
+                    Card(modifier = Modifier.fillMaxWidth()) {
+                        Column(modifier = Modifier.padding(16.dp)) {
+                            Text(
+                                text = dataSource.name,
+                                style = MaterialTheme.typography.titleMedium
+                            )
+                            Text(
+                                text = dataSource.status.name,
+                                style = MaterialTheme.typography.bodyMedium
+                            )
+                        }
                     }
                 }
             }

package/templates/android/DashTemplate/app/src/main/kotlin/com/appship/dash/features/reports/ReportsScreen.kt

@@ -11,12 +11,15 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import com.appship.dash.AppConfig
-import com.appship.dash.mock.MockDataProvider
+import com.appship.dash.data.DataSourceResolver
+import com.appship.dash.core.components.EmptyStateView
+import com.appship.dash.core.components.EmptyStatePresets
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ReportsScreen(modifier: Modifier = Modifier) {
-    val reports by MockDataProvider.reports.collectAsState()
+    val repository = remember { DataSourceResolver.repository }
+    val reports by repository.reports.collectAsState()
     
     Scaffold(
         topBar = {
@@ -35,22 +38,34 @@ fun ReportsScreen(modifier: Modifier = Modifier) {
             )
         }
     ) { paddingValues ->
-        LazyColumn(
-            modifier = modifier.padding(paddingValues),
-            contentPadding = PaddingValues(16.dp),
-            verticalArrangement = Arrangement.spacedBy(8.dp)
-        ) {
-            items(reports) { report ->
-                Card(modifier = Modifier.fillMaxWidth()) {
-                    Column(modifier = Modifier.padding(16.dp)) {
-                        Text(
-                            text = report.title,
-                            style = MaterialTheme.typography.titleMedium
-                        )
-                        Text(
-                            text = report.dateRange.name,
-                            style = MaterialTheme.typography.bodyMedium
-                        )
+        if (reports.isEmpty()) {
+            EmptyStateView(
+                config = EmptyStatePresets.noItems(
+                    message = "No reports generated yet",
+                    onAdd = null
+                ),
+                modifier = modifier
+                    .fillMaxSize()
+                    .padding(paddingValues)
+            )
+        } else {
+            LazyColumn(
+                modifier = modifier.padding(paddingValues),
+                contentPadding = PaddingValues(16.dp),
+                verticalArrangement = Arrangement.spacedBy(8.dp)
+            ) {
+                items(reports) { report ->
+                    Card(modifier = Modifier.fillMaxWidth()) {
+                        Column(modifier = Modifier.padding(16.dp)) {
+                            Text(
+                                text = report.title,
+                                style = MaterialTheme.typography.titleMedium
+                            )
+                            Text(
+                                text = report.dateRange.name,
+                                style = MaterialTheme.typography.bodyMedium
+                            )
+                        }
                     }
                 }
             }

package/templates/android/DashTemplate/app/src/main/kotlin/com/appship/dash/mock/MockDataProvider.kt

@@ -1,6 +1,7 @@
 package com.appship.dash.mock
 
 import com.appship.dash.data.*
+import com.appship.dash.data.DataRepository
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -8,90 +9,90 @@ import java.util.Calendar
 import java.util.Date
 import kotlin.random.Random
 
-object MockDataProvider {
+object MockDataProvider : DataRepository {
     
     // MARK: - StateFlow Properties
     private val _widgets = MutableStateFlow(makeDefaultWidgets())
-    val widgets: StateFlow<List<Widget>> = _widgets.asStateFlow()
+    override val widgets: StateFlow<List<Widget>> = _widgets.asStateFlow()
     
     private val _metrics = MutableStateFlow(makeDefaultMetrics())
-    val metrics: StateFlow<List<Metric>> = _metrics.asStateFlow()
+    override val metrics: StateFlow<List<Metric>> = _metrics.asStateFlow()
     
     private val _alerts = MutableStateFlow(makeDefaultAlerts())
-    val alerts: StateFlow<List<Alert>> = _alerts.asStateFlow()
+    override val alerts: StateFlow<List<Alert>> = _alerts.asStateFlow()
     
     private val _reports = MutableStateFlow(makeDefaultReports())
-    val reports: StateFlow<List<Report>> = _reports.asStateFlow()
+    override val reports: StateFlow<List<Report>> = _reports.asStateFlow()
     
     private val _dataSources = MutableStateFlow(makeDefaultDataSources())
-    val dataSources: StateFlow<List<DataSource>> = _dataSources.asStateFlow()
+    override val dataSources: StateFlow<List<DataSource>> = _dataSources.asStateFlow()
     
     // MARK: - Computed Properties
-    val unreadAlertsCount: Int
+    override val unreadAlertsCount: Int
         get() = _alerts.value.count { !it.isRead }
     
     // MARK: - CRUD Operations - Widgets
-    fun addWidget(widget: Widget) {
+    override fun addWidget(widget: Widget) {
         _widgets.value = _widgets.value + widget
     }
     
-    fun updateWidget(widget: Widget) {
+    override fun updateWidget(widget: Widget) {
         _widgets.value = _widgets.value.map { if (it.id == widget.id) widget else it }
     }
     
-    fun deleteWidget(widget: Widget) {
+    override fun deleteWidget(widget: Widget) {
         _widgets.value = _widgets.value.filter { it.id != widget.id }
     }
     
     // MARK: - CRUD Operations - Metrics
-    fun addMetric(metric: Metric) {
+    override fun addMetric(metric: Metric) {
         _metrics.value = _metrics.value + metric
     }
     
-    fun updateMetric(metric: Metric) {
+    override fun updateMetric(metric: Metric) {
         _metrics.value = _metrics.value.map { if (it.id == metric.id) metric else it }
     }
     
-    fun deleteMetric(metric: Metric) {
+    override fun deleteMetric(metric: Metric) {
         _metrics.value = _metrics.value.filter { it.id != metric.id }
     }
     
     // MARK: - CRUD Operations - Alerts
-    fun addAlert(alert: Alert) {
+    override fun addAlert(alert: Alert) {
         _alerts.value = listOf(alert) + _alerts.value
     }
     
-    fun markAlertAsRead(alert: Alert) {
+    override fun markAlertAsRead(alert: Alert) {
         _alerts.value = _alerts.value.map { if (it.id == alert.id) it.copy(isRead = true) else it }
     }
     
-    fun deleteAlert(alert: Alert) {
+    override fun deleteAlert(alert: Alert) {
         _alerts.value = _alerts.value.filter { it.id != alert.id }
     }
     
-    fun dismissAlert(alert: Alert) {
+    override fun dismissAlert(alert: Alert) {
         markAlertAsRead(alert)
     }
     
     // MARK: - CRUD Operations - Reports
-    fun addReport(report: Report) {
+    override fun addReport(report: Report) {
         _reports.value = listOf(report) + _reports.value
     }
     
-    fun deleteReport(report: Report) {
+    override fun deleteReport(report: Report) {
         _reports.value = _reports.value.filter { it.id != report.id }
     }
     
     // MARK: - CRUD Operations - Data Sources
-    fun addDataSource(dataSource: DataSource) {
+    override fun addDataSource(dataSource: DataSource) {
         _dataSources.value = _dataSources.value + dataSource
     }
     
-    fun updateDataSource(dataSource: DataSource) {
+    override fun updateDataSource(dataSource: DataSource) {
         _dataSources.value = _dataSources.value.map { if (it.id == dataSource.id) dataSource else it }
     }
     
-    fun deleteDataSource(dataSource: DataSource) {
+    override fun deleteDataSource(dataSource: DataSource) {
         _dataSources.value = _dataSources.value.filter { it.id != dataSource.id }
     }
     

package/templates/android/DashTemplate/app/src/test/kotlin/com/appship/dash/DataRepositoryTest.kt

@@ -0,0 +1,41 @@
+package com.appship.dash
+
+import com.appship.dash.data.DataRepository
+import com.appship.dash.data.DataSourceResolver
+import com.appship.dash.mock.MockDataProvider
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Test
+
+/**
+ * Tests that MockDataProvider implements DataRepository and that
+ * DataSourceResolver returns the correct implementation.
+ */
+class DataRepositoryTest {
+
+    private lateinit var repo: DataRepository
+
+    @Before
+    fun setUp() {
+        repo = MockDataProvider
+    }
+
+    // MARK: DataRepository Interface Conformance
+
+    @Test
+    fun testMockDataProviderImplementsDataRepository() {
+        assertTrue("MockDataProvider should implement DataRepository", MockDataProvider is DataRepository)
+    }
+
+    @Test
+    fun testRepositoryLoadData() {
+        assertTrue("widgets should not be empty", repo.widgets.value.isNotEmpty())
+        assertTrue("metrics should not be empty", repo.metrics.value.isNotEmpty())
+    }
+
+    @Test
+    fun testDataSourceResolverReturnsMock() {
+        val resolved = DataSourceResolver.repository
+        assertNotNull("DataSourceResolver should return a non-null repository", resolved)
+    }
+}

package/templates/android/DashTemplate/gradle/libs.versions.toml

@@ -15,6 +15,7 @@ hilt = "2.50"
 hiltNavigationCompose = "1.1.0"
 gson = "2.10.1"
 coroutinesTest = "1.7.3"
+room = "2.6.1"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -38,6 +39,9 @@ hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.r
 androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "hiltNavigationCompose" }
 gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutinesTest" }
+room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
+room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
+room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }