nilsjohan/recipe-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add functionality to move inventory items to pantry and enhance pantry management
Test Suite / test (24.15.0) (push) Has been cancelled
Details

Browse Source 
- Implemented moveInventoryItemToPantry method in InventoryRepository to facilitate moving items from inventory to pantry.
- Enhanced InventoryScreen with a new header section providing context about the inventory.
- Added a button in SwipeableInventoryTile to move items to pantry with appropriate error handling.
- Introduced movePantryItemToInventory method in PantryRepository to support moving items back to inventory.
- Refactored PantryScreen to rename _addToInventory to _moveToInventory for clarity and updated UI to reflect changes.
- Added AdminPantryItem model to represent pantry items in the admin panel.
- Created AdminPantryPanel for managing pantry items, including moving items to inventory and listing users.
- Developed AdminPrivateProductsPanel for managing private products, allowing promotion to global products.
This commit is contained in:
Nils-Johan Gynther
2026-05-11 09:06:30 +02:00
parent edf9c74e75
commit 84ccabe2fe
27 changed files with 1851 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flutter/lib/features/admin/presentation/admin_ai_panel.dart
+40 -12
View File
@@ -55,26 +55,54 @@ class _AdminAiPanelState extends ConsumerState<AdminAiPanel> {
final theme = Theme.of(context);
if (_isLoading) return const Center(child: CircularProgressIndicator());
if (_error != null) {
return Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Text(_error!, style: TextStyle(color: theme.colorScheme.error)),
const SizedBox(height: 16),
FilledButton(onPressed: _load, child: Text(context.l10n.retryAction)),
],
),
return buildCopyableErrorPanel(
context: context,
message: _error!,
onRetry: _load,
title: 'Kunde inte läsa AI-modeller',
);
}
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
context.l10n.adminAiDescription,
style: theme.textTheme.bodyMedium,
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('AI', style: theme.textTheme.titleMedium),
const SizedBox(height: 8),
Text(
context.l10n.adminAiDescription,
style: theme.textTheme.bodyMedium,
),
const SizedBox(height: 8),
const Wrap(
spacing: 8,
runSpacing: 8,
children: [
Chip(label: Text('Models')),
Chip(label: Text('Access')),
Chip(label: Text('Trigger')),
],
),
],
),
),
),
const SizedBox(height: 12),
if (_models.isEmpty)
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Text(
'Inga AI-modeller hittades.',
style: theme.textTheme.bodyMedium,
),
),
),
..._models.map(
(model) => Card(
child: Padding(
flutter/lib/features/admin/presentation/admin_aliases_panel.dart
+40 -13
View File
@@ -147,15 +147,11 @@ class _AdminAliasesPanelState extends ConsumerState<AdminAliasesPanel> {
}
if (_error != null) {
return Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Text(_error!, style: TextStyle(color: theme.colorScheme.error)),
const SizedBox(height: 16),
FilledButton(onPressed: _load, child: const Text('Försök igen')),
],
),
return buildCopyableErrorPanel(
context: context,
message: _error!,
onRetry: _load,
title: 'Kunde inte läsa alias',
);
}
@@ -206,9 +202,31 @@ class _AdminAliasesPanelState extends ConsumerState<AdminAliasesPanel> {
final content = Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Globala alias används som fallback i kvittoimporten. När samma kvittonamn upprepas kan rätt produkt matchas direkt.',
style: theme.textTheme.bodyMedium,
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('Alias', style: theme.textTheme.titleMedium),
const SizedBox(height: 8),
Text(
'Globala alias används som fallback i kvittoimporten. När samma kvittonamn upprepas kan rätt produkt matchas direkt.',
style: theme.textTheme.bodyMedium,
),
const SizedBox(height: 8),
const Wrap(
spacing: 8,
runSpacing: 8,
children: [
Chip(label: Text('Fallback')),
Chip(label: Text('Global')),
Chip(label: Text('Receipt import')),
],
),
],
),
),
),
const SizedBox(height: 12),
Row(
@@ -267,7 +285,16 @@ class _AdminAliasesPanelState extends ConsumerState<AdminAliasesPanel> {
onChanged: (value) => setState(() => _search = value),
),
const SizedBox(height: 12),
if (filteredAliases.isEmpty) const Text('Inga alias hittades.'),
if (filteredAliases.isEmpty)
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Text(
'Inga alias hittades.',
style: theme.textTheme.bodyMedium,
),
),
),
],
);
flutter/lib/features/admin/presentation/admin_database_panel.dart
+120 -35
View File
@@ -4,10 +4,16 @@ import 'package:go_router/go_router.dart';
import '../../../core/api/api_error_mapper.dart';
import '../../../core/l10n/l10n.dart';
import '../../profile/data/profile_repository.dart';
import 'admin_ai_panel.dart';
import 'admin_aliases_panel.dart';
import 'admin_inventory_panel.dart';
import 'admin_pantry_panel.dart';
import 'admin_private_products_panel.dart';
import 'admin_pending_products_panel.dart';
import 'admin_products_panel.dart';
import '../../profile/data/profile_repository.dart';
enum _DatabaseTab { inventory, pantry, products }
enum _DatabaseTab { inventory, pantry, products, privateProducts, pending, aliases, ai }
class AdminDatabasePanel extends ConsumerStatefulWidget {
final bool embedded;
@@ -76,49 +82,124 @@ class _AdminDatabasePanelState extends ConsumerState<AdminDatabasePanel> {
);
}
Widget _panelShell({
required String title,
required String description,
required Widget child,
}) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(title, style: Theme.of(context).textTheme.titleMedium),
const SizedBox(height: 8),
Text(description),
],
),
),
),
const SizedBox(height: 12),
child,
],
);
}
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
String tabLabel(_DatabaseTab tab) {
switch (tab) {
case _DatabaseTab.inventory:
return context.l10n.profileInventoryTab;
case _DatabaseTab.pantry:
return context.l10n.profilePantryTab;
case _DatabaseTab.products:
return context.l10n.profileProductsTab;
}
return switch (tab) {
_DatabaseTab.inventory => context.l10n.profileInventoryTab,
_DatabaseTab.pantry => context.l10n.profilePantryTab,
_DatabaseTab.products => context.l10n.profileProductsTab,
_DatabaseTab.privateProducts => 'Privata produkter',
_DatabaseTab.pending => context.l10n.profilePendingTab,
_DatabaseTab.aliases => 'Alias',
_DatabaseTab.ai => 'AI',
};
}
Widget activeSection;
switch (_activeTab) {
case _DatabaseTab.inventory:
activeSection = _sectionCard(
icon: Icons.inventory_2_outlined,
activeSection = _panelShell(
title: context.l10n.profileInventoryTab,
description: context.l10n.profileInventoryDescription,
onPressed: () => context.go('/inventory'),
buttonLabel: context.l10n.profileOpenInventory,
description: 'Granska, filtrera och redigera inventory-poster. Välj användare för att arbeta på en specifik ägares data.',
child: const AdminInventoryPanel(embedded: true),
);
case _DatabaseTab.pantry:
activeSection = _sectionCard(
icon: Icons.storefront_outlined,
activeSection = _panelShell(
title: context.l10n.profilePantryTab,
description: context.l10n.profilePantryDescription,
onPressed: () => context.go('/baslager'),
buttonLabel: context.l10n.profileOpenPantry,
description: 'Granska och redigera användarnas baslager. Flytta poster till inventarie eller ta bort dem vid behov.',
child: const AdminPantryPanel(embedded: true),
);
case _DatabaseTab.products:
activeSection = const AdminProductsPanel(embedded: true);
activeSection = _panelShell(
title: context.l10n.profileProductsTab,
description: 'Hantera globala produkter: kategorisering, restaurering, merge och AI-stöd.',
child: const AdminProductsPanel(embedded: true),
);
case _DatabaseTab.privateProducts:
activeSection = _panelShell(
title: 'Privata produkter',
description: 'Promotera privata produkter till den globala produkt-tabellen.',
child: const AdminPrivateProductsPanel(embedded: true),
);
case _DatabaseTab.pending:
activeSection = _panelShell(
title: context.l10n.profilePendingTab,
description: 'Godkänn eller avslå nya produkter som föreslagits av användare.',
child: const AdminPendingProductsPanel(embedded: true),
);
case _DatabaseTab.aliases:
activeSection = _panelShell(
title: 'Alias',
description: 'Hantera globala alias som används i receipt-importens första matchningssteg.',
child: const AdminAliasesPanel(embedded: true),
);
case _DatabaseTab.ai:
activeSection = _panelShell(
title: 'AI',
description: 'Se vilka AI-modeller som används och hur de är exponerade i systemet.',
child: const AdminAiPanel(embedded: true),
);
}
return SingleChildScrollView(
padding: widget.embedded ? EdgeInsets.zero : const EdgeInsets.all(16),
final header = SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
context.l10n.profileDatabaseDescription,
style: Theme.of(context).textTheme.bodyMedium,
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('Databas', style: theme.textTheme.titleMedium),
const SizedBox(height: 8),
Text(
'Arbetsyta för data med tydlig scope: inventory och baslager är användarspecifika, produkter är globala eller privata och alias styr importmatchning.',
style: theme.textTheme.bodyMedium,
),
const SizedBox(height: 8),
const Wrap(
spacing: 8,
runSpacing: 8,
children: [
Chip(label: Text('User-scope')),
Chip(label: Text('Global scope')),
Chip(label: Text('Private products')),
Chip(label: Text('Alias')),
],
),
],
),
),
),
const SizedBox(height: 12),
Card(
@@ -127,15 +208,9 @@ class _AdminDatabasePanelState extends ConsumerState<AdminDatabasePanel> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Adminverktyg',
style: Theme.of(context).textTheme.titleMedium,
),
Text('Adminverktyg', style: theme.textTheme.titleMedium),
const SizedBox(height: 8),
Text(
'Uppdatera kategorier manuellt i backend-cachen.',
style: Theme.of(context).textTheme.bodyMedium,
),
Text('Uppdatera kategorier manuellt i backend-cachen.', style: theme.textTheme.bodyMedium),
const SizedBox(height: 12),
SizedBox(
width: double.infinity,
@@ -173,8 +248,18 @@ class _AdminDatabasePanelState extends ConsumerState<AdminDatabasePanel> {
.toList(),
),
),
],
),
);
return Padding(
padding: widget.embedded ? EdgeInsets.zero : const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Expanded(flex: 2, child: header),
const SizedBox(height: 16),
activeSection,
Expanded(flex: 5, child: activeSection),
],
),
);
flutter/lib/features/admin/presentation/admin_inventory_panel.dart
+153 -29
View File
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../../core/api/api_error_mapper.dart';
@@ -278,7 +279,13 @@ class _AdminInventoryPanelState extends ConsumerState<AdminInventoryPanel> {
width: 460,
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Välj två poster för samma användare, produkt och enhet. Source tas bort och target behålls.',
style: Theme.of(context).textTheme.bodyMedium,
),
const SizedBox(height: 12),
DropdownButtonFormField<int>(
initialValue: sourceId,
items: _items
@@ -454,12 +461,58 @@ class _AdminInventoryPanelState extends ConsumerState<AdminInventoryPanel> {
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
if (_isLoading) {
return const Center(child: CircularProgressIndicator());
}
if (_error != null) {
return Center(child: Text(_error!));
final message = _error!;
return Center(
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 720),
child: Card(
margin: const EdgeInsets.all(16),
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text(
'Kunde inte läsa inventory-data',
style: TextStyle(fontSize: 18, fontWeight: FontWeight.w600),
),
const SizedBox(height: 8),
SelectableText(message),
const SizedBox(height: 12),
Wrap(
spacing: 8,
runSpacing: 8,
children: [
FilledButton.icon(
onPressed: _load,
icon: const Icon(Icons.refresh),
label: const Text('Försök igen'),
),
OutlinedButton.icon(
onPressed: () {
Clipboard.setData(ClipboardData(text: message));
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Felmeddelande kopierat.')),
);
},
icon: const Icon(Icons.copy_all),
label: const Text('Kopiera fel'),
),
],
),
],
),
),
),
),
);
}
final filtered = _filtered;
@@ -467,6 +520,33 @@ class _AdminInventoryPanelState extends ConsumerState<AdminInventoryPanel> {
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('Inventory', style: theme.textTheme.titleMedium),
const SizedBox(height: 8),
Text(
'Här arbetar du på användarnas inventory-poster. Du kan filtrera per användare, justera mängder, flytta poster till baslager och slå ihop duplicerade rader.',
style: theme.textTheme.bodyMedium,
),
const SizedBox(height: 8),
const Wrap(
spacing: 8,
runSpacing: 8,
children: [
Chip(label: Text('User-scope')),
Chip(label: Text('Merge')),
Chip(label: Text('Flytta till baslager')),
],
),
],
),
),
),
const SizedBox(height: 12),
Row(
children: [
SizedBox(
@@ -551,35 +631,71 @@ class _AdminInventoryPanelState extends ConsumerState<AdminInventoryPanel> {
const SizedBox(height: 8),
Expanded(
child: Card(
child: ListView.separated(
itemCount: filtered.length,
separatorBuilder: (_, __) => const Divider(height: 1),
itemBuilder: (context, index) {
final item = filtered[index];
return ListTile(
title: Text(item.displayName),
subtitle: Text(
'${item.quantity} ${item.unit} · ${item.username} (${item.userEmail})'
'${item.location == null || item.location!.isEmpty ? '' : ' · ${item.location}'}',
child: filtered.isEmpty
? Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Text('Inventory', style: theme.textTheme.titleMedium),
const SizedBox(height: 8),
Text(
'Inga inventory-poster hittades med nuvarande filter.',
style: theme.textTheme.bodyMedium,
),
],
),
)
: ListView.separated(
itemCount: filtered.length,
separatorBuilder: (_, __) => const Divider(height: 1),
itemBuilder: (context, index) {
final item = filtered[index];
return ListTile(
title: Text(item.displayName),
subtitle: Text(
'${item.quantity} ${item.unit} · ${item.username} (${item.userEmail})'
'${item.location == null || item.location!.isEmpty ? '' : ' · ${item.location}'}',
),
trailing: Row(
mainAxisSize: MainAxisSize.min,
children: [
IconButton(
tooltip: 'Flytta till baslager',
onPressed: () async {
try {
await ref.read(adminRepositoryProvider).moveAdminInventoryToPantry(item.id);
if (!mounted) return;
await _load();
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('Flyttade "${item.displayName}" till baslager.')),
);
} catch (e) {
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
buildCopyableErrorSnackBar(context, mapErrorToUserMessage(e, context)),
);
}
},
icon: const Icon(Icons.storefront_outlined),
),
IconButton(
tooltip: 'Ändra',
onPressed: () => _editItem(item),
icon: const Icon(Icons.edit_outlined),
),
IconButton(
tooltip: 'Ta bort',
onPressed: () => _deleteItem(item),
icon: const Icon(Icons.delete_outline),
),
],
),
);
},
),
trailing: Row(
mainAxisSize: MainAxisSize.min,
children: [
IconButton(
tooltip: 'Ändra',
onPressed: () => _editItem(item),
icon: const Icon(Icons.edit_outlined),
),
IconButton(
tooltip: 'Ta bort',
onPressed: () => _deleteItem(item),
icon: const Icon(Icons.delete_outline),
),
],
),
);
},
),
),
),
],
@@ -681,7 +797,15 @@ class _InventoryFormDialogState extends State<_InventoryFormDialog> {
child: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
widget.initial == null
? 'Skapa en ny inventory-rad för en användare. Välj produkt, mängd, enhet och valfria metadata.'
: 'Ändra den valda inventory-raden. Produkt, mängd, enhet och metadata kan justeras utan att byta ägare.',
style: Theme.of(context).textTheme.bodyMedium,
),
const SizedBox(height: 12),
if (widget.initial == null) ...[
DropdownButtonFormField<int>(
initialValue: _ownerUserId,
flutter/lib/features/admin/presentation/admin_pantry_panel.dart
+341
View File
@@ -0,0 +1,341 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../../core/api/api_error_mapper.dart';
import '../../../core/forms/form_options.dart';
import '../../../core/l10n/l10n.dart';
import '../data/admin_repository.dart';
import '../domain/admin_pantry_item.dart';
import '../domain/user_admin.dart';
class AdminPantryPanel extends ConsumerStatefulWidget {
final bool embedded;
const AdminPantryPanel({super.key, this.embedded = false});
@override
ConsumerState<AdminPantryPanel> createState() => _AdminPantryPanelState();
}
class _AdminPantryPanelState extends ConsumerState<AdminPantryPanel> {
bool _isLoading = true;
String? _error;
int? _selectedUserId;
List<AdminPantryItem> _items = [];
List<UserAdmin> _users = [];
@override
void initState() {
super.initState();
_load();
}
Future<void> _load() async {
setState(() {
_isLoading = true;
_error = null;
});
try {
final results = await Future.wait<dynamic>([
ref.read(adminRepositoryProvider).listAdminPantry(userId: _selectedUserId),
ref.read(adminRepositoryProvider).listUsers(),
]);
if (!mounted) return;
setState(() {
_items = results[0] as List<AdminPantryItem>;
_users = results[1] as List<UserAdmin>;
});
} catch (e) {
if (!mounted) return;
setState(() => _error = mapErrorToUserMessage(e, context));
} finally {
if (mounted) setState(() => _isLoading = false);
}
}
Future<void> _moveToInventory(AdminPantryItem item) async {
final quantityController = TextEditingController(text: '1');
String selectedUnit = 'st';
String? selectedLocation;
String? formError;
final payload = await showDialog<Map<String, dynamic>>(
context: context,
builder: (ctx) {
return StatefulBuilder(
builder: (ctx, setDialogState) {
return AlertDialog(
title: Text(context.l10n.pantryAddToInventoryTitle(item.displayName)),
content: SizedBox(
width: 380,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
TextField(
controller: quantityController,
keyboardType: const TextInputType.numberWithOptions(decimal: true),
decoration: InputDecoration(
labelText: context.l10n.inventoryQuantityDisplayLabel,
border: const OutlineInputBorder(),
),
),
const SizedBox(height: 12),
DropdownButtonFormField<String>(
initialValue: selectedUnit,
isExpanded: true,
decoration: InputDecoration(
labelText: context.l10n.unitLabel,
border: const OutlineInputBorder(),
),
items: unitOptions
.map((option) => DropdownMenuItem<String>(
value: option.value,
child: Text(option.label),
))
.toList(),
onChanged: (value) {
if (value == null) return;
setDialogState(() => selectedUnit = value);
},
),
const SizedBox(height: 12),
DropdownButtonFormField<String>(
initialValue: selectedLocation,
isExpanded: true,
decoration: InputDecoration(
labelText: context.l10n.locationOptionalLabel,
border: const OutlineInputBorder(),
),
items: [
DropdownMenuItem<String>(
value: null,
child: Text(context.l10n.pantryNoLocation),
),
...inventoryLocationOptions.map(
(location) => DropdownMenuItem<String>(
value: location,
child: Text(location),
),
),
],
onChanged: (value) {
setDialogState(() => selectedLocation = value);
},
),
if (formError != null) ...[
const SizedBox(height: 8),
Text(
formError!,
style: TextStyle(color: Theme.of(ctx).colorScheme.error),
),
],
],
),
),
actions: [
TextButton(
onPressed: () => Navigator.pop(ctx),
child: Text(context.l10n.cancelAction),
),
FilledButton(
onPressed: () {
final quantity = double.tryParse(
quantityController.text.trim().replaceAll(',', '.'),
);
if (quantity == null || quantity <= 0) {
setDialogState(() {
formError = context.l10n.pantryInvalidQuantity;
});
return;
}
Navigator.pop(ctx, {
'quantity': quantity,
'unit': selectedUnit,
'location': selectedLocation,
});
},
child: Text(context.l10n.addAction),
),
],
);
},
);
},
);
quantityController.dispose();
if (payload == null) return;
try {
await ref.read(adminRepositoryProvider).moveAdminPantryToInventory(
item.id,
{
'productId': item.productId,
'quantity': payload['quantity'] as double,
'unit': payload['unit'] as String,
if (payload['location'] != null) 'location': payload['location'] as String,
},
);
if (!mounted) return;
await _load();
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('Flyttade "${item.displayName}" till inventarie.')),
);
} catch (e) {
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
buildCopyableErrorSnackBar(context, mapErrorToUserMessage(e, context)),
);
}
}
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
if (_isLoading) return const Center(child: CircularProgressIndicator());
if (_error != null) {
return buildCopyableErrorPanel(
context: context,
message: _error!,
onRetry: _load,
title: 'Kunde inte läsa admin pantry',
);
}
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('Baslager', style: theme.textTheme.titleMedium),
const SizedBox(height: 8),
Text(
'Här ser du användarnas pantryposter. Flytta dem tillbaka till inventarie eller ta bort poster som inte längre ska ligga kvar.',
style: theme.textTheme.bodyMedium,
),
const SizedBox(height: 8),
const Wrap(
spacing: 8,
runSpacing: 8,
children: [
Chip(label: Text('User-scope')),
Chip(label: Text('Flytta till inventarie')),
Chip(label: Text('Ta bort')),
],
),
],
),
),
),
const SizedBox(height: 12),
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Row(
children: [
Expanded(
child: DropdownButtonFormField<int>(
initialValue: _selectedUserId,
decoration: const InputDecoration(labelText: 'Filtrera användare'),
items: [
const DropdownMenuItem<int>(
value: null,
child: Text('Alla användare'),
),
..._users.map(
(user) => DropdownMenuItem<int>(
value: user.id,
child: Text('${user.displayName} (${user.username})'),
),
),
],
onChanged: (value) {
setState(() => _selectedUserId = value);
_load();
},
),
),
const SizedBox(width: 8),
OutlinedButton.icon(
onPressed: _load,
icon: const Icon(Icons.refresh),
label: const Text('Uppdatera'),
),
],
),
),
),
const SizedBox(height: 12),
Expanded(
child: _items.isEmpty
? Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('Baslager', style: theme.textTheme.titleMedium),
const SizedBox(height: 8),
Text(
'Här ser du användarnas pantryposter. Flytta dem tillbaka till inventarie eller ta bort poster som inte längre ska ligga kvar.',
style: theme.textTheme.bodyMedium,
),
const SizedBox(height: 8),
Text(
'Inga pantry-poster hittades.',
style: theme.textTheme.bodyMedium,
),
],
),
),
)
: ListView.separated(
itemCount: _items.length,
separatorBuilder: (_, __) => const Divider(height: 1),
itemBuilder: (context, index) {
final item = _items[index];
return ListTile(
title: Text(item.displayName),
subtitle: Text(
'${item.username} (${item.userEmail})${item.location == null || item.location!.trim().isEmpty ? '' : ' · ${item.location}'}',
),
trailing: Row(
mainAxisSize: MainAxisSize.min,
children: [
IconButton(
tooltip: 'Flytta till inventarie',
icon: const Icon(Icons.inventory_2_outlined),
onPressed: () => _moveToInventory(item),
),
IconButton(
tooltip: 'Ta bort',
icon: const Icon(Icons.delete_outline, color: Colors.red),
onPressed: () async {
try {
await ref.read(adminRepositoryProvider).removeAdminPantryItem(item.id);
if (!mounted) return;
await _load();
} catch (e) {
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
buildCopyableErrorSnackBar(context, mapErrorToUserMessage(e, context)),
);
}
},
),
],
),
);
},
),
),
],
);
}
}
flutter/lib/features/admin/presentation/admin_pending_products_panel.dart
+45 -15
View File
@@ -69,24 +69,32 @@ class _AdminPendingProductsPanelState
final theme = Theme.of(context);
if (_isLoading) return const Center(child: CircularProgressIndicator());
if (_error != null) {
return Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Text(_error!, style: TextStyle(color: theme.colorScheme.error)),
const SizedBox(height: 16),
FilledButton(onPressed: _load, child: Text(context.l10n.retryAction)),
],
),
return buildCopyableErrorPanel(
context: context,
message: _error!,
onRetry: _load,
title: 'Pending produkter',
);
}
if (_products.isEmpty) {
return Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Text(
context.l10n.adminNoPendingProducts,
style: theme.textTheme.bodyMedium,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('Pending produkter', style: theme.textTheme.titleMedium),
const SizedBox(height: 8),
Text(
'Detta är användarsubmittade produkter som väntar på att godkännas eller avslås innan de blir en del av den globala produkt-tabellen.',
style: theme.textTheme.bodyMedium,
),
const SizedBox(height: 8),
Text(
context.l10n.adminNoPendingProducts,
style: theme.textTheme.bodyMedium,
),
],
),
),
);
@@ -145,9 +153,31 @@ class _AdminPendingProductsPanelState
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
context.l10n.adminPendingDescription,
style: theme.textTheme.bodyMedium,
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('Pending produkter', style: theme.textTheme.titleMedium),
const SizedBox(height: 8),
Text(
'Detta är användarsubmittade produkter som väntar på att godkännas eller avslås innan de blir en del av den globala produkt-tabellen.',
style: theme.textTheme.bodyMedium,
),
const SizedBox(height: 8),
const Wrap(
spacing: 8,
runSpacing: 8,
children: [
Chip(label: Text('User-suggested')),
Chip(label: Text('Approve/Reject')),
Chip(label: Text('Global promotion')),
],
),
],
),
),
),
const SizedBox(height: 12),
content,
flutter/lib/features/admin/presentation/admin_private_products_panel.dart
+156
View File
@@ -0,0 +1,156 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../../core/api/api_error_mapper.dart';
import '../data/admin_repository.dart';
import '../domain/pending_product.dart';
class AdminPrivateProductsPanel extends ConsumerStatefulWidget {
final bool embedded;
const AdminPrivateProductsPanel({super.key, this.embedded = false});
@override
ConsumerState<AdminPrivateProductsPanel> createState() =>
_AdminPrivateProductsPanelState();
}
class _AdminPrivateProductsPanelState extends ConsumerState<AdminPrivateProductsPanel> {
bool _isLoading = true;
String? _error;
List<PendingProduct> _products = [];
@override
void initState() {
super.initState();
_load();
}
Future<void> _load() async {
setState(() {
_isLoading = true;
_error = null;
});
try {
final products = await ref.read(adminRepositoryProvider).listPrivateProducts();
if (!mounted) return;
setState(() => _products = products);
} catch (e) {
if (!mounted) return;
setState(() => _error = mapErrorToUserMessage(e, context));
} finally {
if (mounted) setState(() => _isLoading = false);
}
}
Future<void> _promote(PendingProduct product) async {
try {
await ref.read(adminRepositoryProvider).promotePrivateProduct(product.id);
if (!mounted) return;
await _load();
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('Promoterade "${product.displayName}" till global produkt.')),
);
} catch (e) {
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
buildCopyableErrorSnackBar(context, mapErrorToUserMessage(e, context)),
);
}
}
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
if (_isLoading) return const Center(child: CircularProgressIndicator());
if (_error != null) {
return buildCopyableErrorPanel(
context: context,
message: _error!,
onRetry: _load,
title: 'Kunde inte läsa privata produkter',
);
}
if (_products.isEmpty) {
return Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('Privata produkter', style: theme.textTheme.titleMedium),
const SizedBox(height: 8),
Text(
'Privata produkter är användarägda poster som kan lyftas upp till globala produkter när de ska återanvändas brett.',
style: theme.textTheme.bodyMedium,
),
const SizedBox(height: 8),
Text(
'Inga aktiva privata produkter hittades.',
style: theme.textTheme.bodyMedium,
),
],
),
),
);
}
final list = ListView.separated(
shrinkWrap: false,
physics: null,
itemCount: _products.length,
separatorBuilder: (_, __) => const Divider(height: 1),
itemBuilder: (context, index) {
final product = _products[index];
return Card(
child: ListTile(
leading: const Icon(Icons.publish_outlined),
title: Text(product.displayName),
subtitle: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
if (product.categoryPath != null)
Text('Kategori: ${product.categoryPath}'),
Text('Ägare: ${product.ownerUsername ?? '—'}'),
Text('Skapad: ${product.createdAt == null ? '—' : MaterialLocalizations.of(context).formatShortDate(product.createdAt!)}'),
],
),
trailing: FilledButton(
onPressed: () => _promote(product),
child: const Text('Promote'),
),
),
);
},
);
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('Privata produkter', style: theme.textTheme.titleMedium),
const SizedBox(height: 8),
Text(
'Privata produkter kan promoveras till globala produkter utan att användarens privata kopia försvinner.',
style: theme.textTheme.bodyMedium,
),
],
),
),
),
const SizedBox(height: 12),
Expanded(child: list),
],
);
}
}
flutter/lib/features/admin/presentation/admin_products_panel.dart
+52 -12
View File
@@ -199,7 +199,10 @@ class _AdminProductsPanelState extends ConsumerState<AdminProductsPanel> {
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(context.l10n.adminMergeProductsHint),
Text(
'Välj vilken produkt som ska behållas som mål. Källprodukten slås ihop i målet och relaterad inventarie flyttas med.',
style: Theme.of(context).textTheme.bodyMedium,
),
const SizedBox(height: 12),
SegmentedButton<int>(
segments: [
@@ -330,6 +333,11 @@ class _AdminProductsPanelState extends ConsumerState<AdminProductsPanel> {
children: [
Text('Produkt-ID: ${product.id}'),
const SizedBox(height: 12),
Text(
'Sätt ett kanoniskt namn som ska användas i gränssnitt och vid sammanslagning. Det ändrar inte produkt-ID.',
style: Theme.of(context).textTheme.bodyMedium,
),
const SizedBox(height: 12),
TextField(
controller: controller,
autofocus: true,
@@ -491,7 +499,7 @@ class _AdminProductsPanelState extends ConsumerState<AdminProductsPanel> {
void _showError(Object e) {
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(mapErrorToUserMessage(e, context))),
buildCopyableErrorSnackBar(context, mapErrorToUserMessage(e, context)),
);
}
@@ -530,21 +538,45 @@ class _AdminProductsPanelState extends ConsumerState<AdminProductsPanel> {
if (_isLoading) return const Center(child: CircularProgressIndicator());
if (_error != null) {
return Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Text(_error!, style: TextStyle(color: theme.colorScheme.error)),
const SizedBox(height: 16),
FilledButton(onPressed: _load, child: Text(context.l10n.retryAction)),
],
),
return buildCopyableErrorPanel(
context: context,
message: _error!,
onRetry: _load,
title: 'Globala produkter',
);
}
final content = Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('Globala produkter', style: theme.textTheme.titleMedium),
const SizedBox(height: 8),
Text(
'Detta är den globala produkt-tabellen. Här ändrar du kategorier, sammanslår poster, återställer borttagna produkter och styr AI-assisterad kategorisering.',
style: theme.textTheme.bodyMedium,
),
const SizedBox(height: 8),
Wrap(
spacing: 8,
runSpacing: 8,
children: const [
Chip(label: Text('Global')),
Chip(label: Text('CRUD')),
Chip(label: Text('Merge')),
Chip(label: Text('AI-kategorisering')),
],
),
],
),
),
),
const SizedBox(height: 12),
TextField(
decoration: InputDecoration(
labelText: context.l10n.adminSearchProduct,
@@ -665,7 +697,15 @@ class _AdminProductsPanelState extends ConsumerState<AdminProductsPanel> {
),
const SizedBox(height: 16),
if (filtered.isEmpty)
Text(context.l10n.adminNoProductsFound)
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Text(
context.l10n.adminNoProductsFound,
style: theme.textTheme.bodyMedium,
),
),
)
else
...filtered.map(
(product) => Card(
flutter/lib/features/admin/presentation/admin_screen.dart
+31 -31
View File
@@ -1,12 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../../core/l10n/l10n.dart';
import 'admin_ai_panel.dart';
import 'admin_aliases_panel.dart';
import 'admin_database_panel.dart';
import 'admin_inventory_panel.dart';
import 'admin_pending_products_panel.dart';
import 'admin_products_panel.dart';
import 'admin_users_panel.dart';
class AdminScreen extends ConsumerStatefulWidget {
@@ -19,10 +14,40 @@ class AdminScreen extends ConsumerStatefulWidget {
class _AdminScreenState extends ConsumerState<AdminScreen> {
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
return DefaultTabController(
length: 7,
length: 2,
child: Column(
children: [
Padding(
padding: const EdgeInsets.fromLTRB(12, 12, 12, 8),
child: Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('Admin', style: theme.textTheme.titleMedium),
const SizedBox(height: 8),
Text(
'Användare är för konton och roller. Databas är arbetsytan för inventarie, baslager, produkter, alias och importflöden.',
style: theme.textTheme.bodyMedium,
),
const SizedBox(height: 8),
const Wrap(
spacing: 8,
runSpacing: 8,
children: [
Chip(label: Text('Konton')),
Chip(label: Text('Databas')),
Chip(label: Text('Privat + globalt')),
],
),
],
),
),
),
),
Material(
color: Theme.of(context).colorScheme.surface,
child: TabBar(
@@ -30,11 +55,6 @@ class _AdminScreenState extends ConsumerState<AdminScreen> {
tabs: [
Tab(text: context.l10n.profileUsersTab, icon: const Icon(Icons.people_outline)),
const Tab(text: 'Databas', icon: Icon(Icons.storage_outlined)),
const Tab(text: 'Inventory', icon: Icon(Icons.inventory_outlined)),
const Tab(text: 'Produkter', icon: Icon(Icons.inventory_2_outlined)),
Tab(text: context.l10n.profilePendingTab, icon: const Icon(Icons.pending_actions_outlined)),
const Tab(text: 'Alias', icon: Icon(Icons.link_outlined)),
const Tab(text: 'AI', icon: Icon(Icons.auto_awesome_outlined)),
],
),
),
@@ -49,26 +69,6 @@ class _AdminScreenState extends ConsumerState<AdminScreen> {
padding: EdgeInsets.fromLTRB(12, 12, 12, 8),
child: AdminDatabasePanel(embedded: true),
),
Padding(
padding: EdgeInsets.fromLTRB(12, 12, 12, 8),
child: AdminInventoryPanel(embedded: true),
),
Padding(
padding: EdgeInsets.fromLTRB(12, 12, 12, 8),
child: AdminProductsPanel(embedded: true),
),
Padding(
padding: EdgeInsets.fromLTRB(12, 12, 12, 8),
child: AdminPendingProductsPanel(embedded: true),
),
Padding(
padding: EdgeInsets.fromLTRB(12, 12, 12, 8),
child: AdminAliasesPanel(embedded: true),
),
Padding(
padding: EdgeInsets.fromLTRB(12, 12, 12, 8),
child: AdminAiPanel(embedded: true),
),
],
),
),
flutter/lib/features/admin/presentation/admin_users_panel.dart
+67 -24
View File
@@ -254,10 +254,7 @@ class _AdminUsersPanelState extends ConsumerState<AdminUsersPanel> {
void _showError(Object e) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(mapErrorToUserMessage(e, context)),
backgroundColor: Theme.of(context).colorScheme.error,
),
buildCopyableErrorSnackBar(context, mapErrorToUserMessage(e, context)),
);
}
@@ -299,15 +296,11 @@ class _AdminUsersPanelState extends ConsumerState<AdminUsersPanel> {
return const Center(child: CircularProgressIndicator());
}
if (_error != null) {
return Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Text(_error!, style: TextStyle(color: theme.colorScheme.error)),
const SizedBox(height: 16),
FilledButton(onPressed: _load, child: Text(context.l10n.retryAction)),
],
),
return buildCopyableErrorPanel(
context: context,
message: _error!,
onRetry: _load,
title: 'Kunde inte läsa användare',
);
}
if (_users.isEmpty) {
@@ -315,14 +308,36 @@ class _AdminUsersPanelState extends ConsumerState<AdminUsersPanel> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (widget.embedded) ...[
FilledButton.icon(
onPressed: _createUser,
icon: const Icon(Icons.person_add_outlined),
label: Text(context.l10n.adminNewUser),
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('Användarkonton', style: theme.textTheme.titleMedium),
const SizedBox(height: 8),
Text(
'Här styr du konton, roller, premium och delning. När listan är tom kan du skapa den första användaren direkt.',
style: theme.textTheme.bodyMedium,
),
const SizedBox(height: 12),
FilledButton.icon(
onPressed: _createUser,
icon: const Icon(Icons.person_add_outlined),
label: Text(context.l10n.adminNewUser),
),
],
),
),
),
const SizedBox(height: 16),
],
Text(context.l10n.adminNoUsers),
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Text(context.l10n.adminNoUsers),
),
),
],
);
}
@@ -354,14 +369,36 @@ class _AdminUsersPanelState extends ConsumerState<AdminUsersPanel> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('Användarkonton', style: theme.textTheme.titleMedium),
const SizedBox(height: 8),
Text(
context.l10n.adminUsersDescription,
style: theme.textTheme.bodyMedium,
),
const SizedBox(height: 8),
const Wrap(
spacing: 8,
runSpacing: 8,
children: [
Chip(label: Text('Roller')),
Chip(label: Text('Premium')),
Chip(label: Text('Delning')),
],
),
],
),
),
),
const SizedBox(height: 12),
Row(
children: [
Expanded(
child: Text(
context.l10n.adminUsersDescription,
style: theme.textTheme.bodyMedium,
),
),
const Spacer(),
IconButton(
icon: const Icon(Icons.refresh),
tooltip: 'Uppdatera',
@@ -561,7 +598,13 @@ class _CreateUserDialogState extends State<_CreateUserDialog> {
child: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Skapa ett nytt konto med tydlig roll direkt från adminvyn. Du väljer bara uppgifter som krävs för inloggning och åtkomst.',
style: Theme.of(context).textTheme.bodyMedium,
),
const SizedBox(height: 12),
TextFormField(
controller: _usernameCtrl,
decoration: InputDecoration(labelText: context.l10n.profileUsernameLabel),