Merge branch 'dev'

Author: Clon1998

.gitignore

@@ -54,3 +54,4 @@ GoogleService-Info.plist
 
 *.patch
 /lib/license.dart
+firebase.json

assets/translations/de.json

@@ -50,7 +50,9 @@
     "activate": "Activ",
     "stop": "Stoppen",
     "start": "Starten",
-    "repeat": "Wiederholen"
+    "repeat": "Wiederholen",
+    "load_more": "Mehr laden",
+    "archived": "Archiviert"
   },
   "pages": {
     "dashboard": {
@@ -396,13 +398,14 @@
         "read_only": "Webcam ist schreibgeschützt"
       },
       "macros": {
+        "default_grp": "Standard",
         "new_macro_grp": "Neue Makro - Gruppe",
         "no_macros_available": "Keine Makros verfügbar!",
         "no_macros_found": "Keine Makros gefunden!",
         "no_macros_in_grp": "Keine Makros in der Gruppe!",
         "deleted_grp": "Gruppe {} gelöscht",
         "macros": "Makros",
-        "default_name": "Neuer Makro",
+        "default_name": "Neue Makro Gruppe",
         "macros_to_default": {
           "one": "Ein Makro in die Standardgruppe verschoben!",
           "two": "Zwei Makro in die Standardgruppe verschoben!",
@@ -597,7 +600,9 @@
     },
     "spoolman": {
       "title": "Spoolman",
-      "not_available": "Spoolman ist für diesen Drucker nicht verfügbar. Bitte stellen Sie sicher, dass Spoolman auf Ihrem Drucker installiert und aktiviert ist.",
+      "not_available": "Spoolman ist für diesen Drucker nicht verfügbar.\nBitte stellen Sie sicher, dass Spoolman auf Ihrem Drucker installiert und aktiviert ist.",
+      "learn_more": "Um mehr über Spoolman zu erfahren und wie Sie ihn installieren können, besuchen Sie die ",
+      "learn_more_link": "GitHub Seite.",
       "no_spools": "Keine Spulen gefunden!",
       "no_filaments": "Keine Filamente gefunden!",
       "no_vendors": "Keine Anbieter gefunden!",

assets/translations/en.json

@@ -50,7 +50,9 @@
     "activate": "Activate",
     "stop": "Stop",
     "start": "Start",
-    "repeat": "Repeat"
+    "repeat": "Repeat",
+    "load_more": "Load more",
+    "archived": "Archived"
   },
   "pages": {
     "dashboard": {
@@ -396,13 +398,14 @@
         "read_only": "Webcam is read-only"
       },
       "macros": {
+        "default_grp": "Default",
         "new_macro_grp": "New Macro - Group",
         "no_macros_available": "No Macros available!",
         "no_macros_found": "No Macros found!",
         "no_macros_in_grp": "No macros in the group!",
         "deleted_grp": "Deleted group {}",
         "macros": "Macros",
-        "default_name": "New Macro",
+        "default_name": "New Macro Group",
         "macros_to_default": {
           "one": "Moved one macro to default group!",
           "two": "Moved two macro to default group!",
@@ -597,7 +600,9 @@
     },
     "spoolman": {
       "title": "Spoolman",
-      "not_available": "Spoolman is not available for this printer. Please make sure that Spoolman is installed and enabled on your printer.",
+      "not_available": "Spoolman is not available for this printer. \nPlease make sure that Spoolman is installed and enabled on your printer.",
+      "learn_more": "To learn more about Spoolman and how to install it, visit the project's",
+      "learn_more_link": "GitHub page.",
       "no_spools": "No spools found!",
       "no_filaments": "No filaments found!",
       "no_vendors": "No vendors found!",

common/lib/service/app_router.dart

@@ -9,7 +9,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 part 'app_router.g.dart';
 
 mixin RouteDefinitionMixin {
-  String? get name;
+  // String get name;
 }
 
 @riverpod

common/lib/service/machine_service.dart

@@ -26,6 +26,7 @@ import 'package:common/util/extensions/logging_extension.dart';
 import 'package:common/util/extensions/ref_extension.dart';
 import 'package:common/util/extensions/uri_extension.dart';
 import 'package:common/util/logger.dart';
+import 'package:easy_localization/easy_localization.dart';
 import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:flutter/foundation.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -134,50 +135,24 @@ Future<List<Machine>> hiddenMachines(HiddenMachinesRef ref) async {
 }
 
 @riverpod
-Stream<MachineSettings> machineSettings(MachineSettingsRef ref, String machineUUID) {
+Stream<MachineSettings> machineSettings(MachineSettingsRef ref, String machineUUID) async* {
   ref.keepAliveFor();
 
-  ref.listenSelf((previous, next) {
-    logger.wtf('machineSettings updated to isLoading: ${next.isLoading}, $next');
-  });
+  // We listen to macro count changes to trigger a provider rebuild, allowing us to migrate the setting's macros
+  var macroCnt = await ref.watch(printerProvider(machineUUID).selectAsync((data) => data.gcodeMacros.length));
 
-  StreamController<MachineSettings> streamController = StreamController();
-  ref.onDispose(() {
-    streamController.close();
-  });
+  // Converts Klippy ready state to a stream of settings -> Emits new settings each time the Klippy state is transitioning to ready
+  yield* ref
+      .watchAsSubject(klipperProvider(machineUUID))
+      .where((event) => event.klippyState == KlipperState.ready)
+      .distinct()
+      .asyncMap((event) async {
+    var printerData = await ref.read(printerProvider(machineUUID).future);
 
-  ref.listen(
-    klipperProvider(machineUUID),
-    (previous, next) async {
-      switch (next) {
-        // Normal data
-        case AsyncValue(
-            hasValue: true,
-            hasError: false,
-            isLoading: false,
-            value: KlipperInstance(klippyState: KlipperState.ready)
-          ):
-          try {
-            var fetchSettings = await ref.read(machineServiceProvider).fetchSettings(machineUUID: machineUUID);
-            streamController.add(fetchSettings);
-          } catch (e) {
-            logger.e('Error while fetching settings', e);
-            streamController.addError(e);
-          }
-          break;
-        // We have an error
-        case AsyncValue(hasError: true, isLoading: false, error: var err, stackTrace: var trace):
-          if (err != null) {
-            streamController.addError(err, trace);
-          }
-
-        case AsyncValue(isLoading: true) when previous != null:
-          ref.invalidateSelf();
-      }
-    },
-    fireImmediately: true,
-  );
-  return streamController.stream.distinct();
+    return await ref
+        .read(machineServiceProvider)
+        .fetchSettingsAndAdjustDefaultMacros(machineUUID, printerData.gcodeMacros);
+  });
 }
 
 @riverpod
@@ -531,13 +506,30 @@ class MachineService {
     return i;
   }
 
-  Future<void> updateMacrosInSettings(String machineUUID, List<String> macros) async {
+  /// Fetches the settings for a machine and adjusts the default macros.
+  ///
+  /// This method fetches the settings for a machine with the provided UUID.
+  /// It then adjusts the default macros based on the provided list of macros.
+  /// If a macro already exists in the default group, it is not added again.
+  /// If a macro does not exist in the default group, it is added.
+  /// If a macro exists in the default group but not in the provided list, it is removed.
+  ///
+  /// This method is useful for keeping the default macros up to date with the actual macros
+  /// that are available on the machine.
+  ///
+  /// [machineUUID] is the UUID of the machine to fetch the settings for.
+  /// [macros] is the list of macros to adjust the default macros with.
+  ///
+  /// Throws a [MobilerakerException] if the machine with the provided UUID does not exist.
+  ///
+  /// Returns the updated [MachineSettings] for the machine.
+  Future<MachineSettings> fetchSettingsAndAdjustDefaultMacros(String machineUUID, List<String> macros) async {
     // Get the machine with the provided UUID
     final machine = await _machineRepo.get(uuid: machineUUID);
 
     if (machine == null) {
       logger.e('Could not update macros, machine $machineUUID not found!');
-      return;
+      return throw const MobilerakerException('Machine not found');
     }
 
     // Log the machine information
@@ -572,14 +564,15 @@ class MachineService {
         logger.i('Found legacy default group, migrating it to the new default group format!');
         modifiableMacroGrps.remove(legacyDefaultGrp);
 
-        return MacroGroup.defaultGroup(name: 'Default', macros: legacyDefaultGrp.macros);
+        return MacroGroup.defaultGroup(
+            name: tr('pages.printer_edit.macros.default_grp'), macros: legacyDefaultGrp.macros);
       }
 
-      return MacroGroup.defaultGroup(name: 'Default');
+      return MacroGroup.defaultGroup(name: tr('pages.printer_edit.macros.default_grp'));
     });
 
     // If there's no legacy group and no new macros to add, return early
-    if (!hasLegacyDefaultGroup && !hasUnavailableMacro && filteredRawMacros.isEmpty) return;
+    if (!hasLegacyDefaultGroup && !hasUnavailableMacro && filteredRawMacros.isEmpty) return machineSettings;
 
     if (hasUnavailableMacro) {
       logger.i('Found some unavailable macros, will update all groups without the unavailable macros!');
@@ -603,6 +596,7 @@ class MachineService {
     // Update the machine settings and save
     machineSettings.macroGroups = modifiableMacroGrps;
     await ref.read(machineSettingsRepositoryProvider(machine.uuid)).update(machineSettings);
+    return machineSettings;
   }
 
   /// Links the machine to the octoEverywhere service

common/lib/service/moonraker/printer_service.dart

@@ -230,7 +230,7 @@ class PrinterService {
       if (disposed) return;
       // I need this temp variable since in some edge cases the updateSettings otherwise throws?
       var printerObj = printerBuilder.build();
-      _machineService.updateMacrosInSettings(ownerUUID, printerObj.gcodeMacros).ignore();
+      // _machineService.updateMacrosInSettings(ownerUUID, printerObj.gcodeMacros).ignore();
       _registerJrpcHandlers();
       _makeSubscribeRequest(printerObj.queryableObjects);
       current = printerObj;

lib/ui/components/connection/klippy_state_widget.dart common/lib/ui/components/connection/klippy_provider_guard.dart

@@ -14,23 +14,26 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_icons/flutter_icons.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:mobileraker/ui/components/connection/connection_state_controller.dart';
-import 'package:mobileraker/ui/components/power_api_card.dart';
 
-import 'connection_state_view.dart';
+import '../../../service/app_router.dart';
+import '../../../service/machine_service.dart';
 
-class KlippyStateWidget extends HookConsumerWidget {
-  const KlippyStateWidget({
+class KlippyProviderGuard extends HookConsumerWidget {
+  const KlippyProviderGuard({
     super.key,
     required this.machineUUID,
     required this.onConnected,
     this.skipKlipperReady = false,
+    this.klippyErrorChildren,
   });
 
   final String machineUUID;
-  final OnConnectedBuilder onConnected;
+  final Widget Function(BuildContext context, String machineUUID) onConnected;
   final bool skipKlipperReady;
 
+  // Additional children to show when klippy is in error state
+  final List<Widget>? klippyErrorChildren;
+
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     // If we had a AsyncData previously, the dashboard should take care of showing KLIPPY errors
@@ -56,7 +59,7 @@ class KlippyStateWidget extends HookConsumerWidget {
           // The `when !wasFetched` ensures to skip the state error if we had a AsyncData before -> the dashboard should take care of showing errors
         )
             when !skipKlipperReady && !wasFetched =>
-          _StateError(data: kInstance, machineUUID: machineUUID),
+          _StateError(data: kInstance, machineUUID: machineUUID, onErrorChildren: klippyErrorChildren),
         AsyncData(value: KlipperInstance(klippyState: KlipperState.unauthorized)) => const _StateUnauthorized(),
         AsyncError(:final error) => _ProviderError(machineUUID: machineUUID, error: error),
         _ => onConnected(context, machineUUID),
@@ -66,10 +69,11 @@ class KlippyStateWidget extends HookConsumerWidget {
 }
 
 class _StateError extends ConsumerWidget {
-  const _StateError({super.key, required this.data, required this.machineUUID});
+  const _StateError({super.key, required this.data, required this.machineUUID, this.onErrorChildren});
 
   final KlipperInstance data;
   final String machineUUID;
+  final List<Widget>? onErrorChildren;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -102,14 +106,18 @@ class _StateError extends ConsumerWidget {
                     mainAxisAlignment: data.klippyConnected ? MainAxisAlignment.spaceBetween : MainAxisAlignment.center,
                     children: [
                       ElevatedButton(
-                        onPressed: ref.read(connectionStateControllerProvider.notifier).onRestartKlipperPressed,
+                        onPressed: () {
+                          ref.read(klipperServiceProvider(machineUUID)).restartKlipper();
+                        },
                         child: const Text(
                           'pages.dashboard.general.restart_klipper',
                         ).tr(),
                       ),
                       if (data.klippyConnected)
                         ElevatedButton(
-                          onPressed: ref.read(connectionStateControllerProvider.notifier).onRestartMCUPressed,
+                          onPressed: () {
+                            ref.read(klipperServiceProvider(machineUUID)).restartMCUs();
+                          },
                           child: const Text(
                             'pages.dashboard.general.restart_mcu',
                           ).tr(),
@@ -121,7 +129,7 @@ class _StateError extends ConsumerWidget {
             ),
           ),
         ),
-        if (data.hasPowerComponent) PowerApiCard(machineUUID: machineUUID),
+        if (onErrorChildren != null) ...onErrorChildren!,
       ],
     );
   }
@@ -142,7 +150,9 @@ class _StateUnauthorized extends ConsumerWidget {
           textAlign: TextAlign.center,
         ),
         TextButton(
-          onPressed: ref.read(connectionStateControllerProvider.notifier).onEditPrinter,
+          onPressed: () {
+            ref.read(goRouterProvider).pushNamed('printerEdit', extra: machine);
+          },
           child: Text('components.nav_drawer.printer_settings'.tr()),
         ),
       ],