Ensured only available Macros are shown in the UI

Author: Clon1998

lib/domain/moonraker/gcode_macro.dart

@@ -13,7 +13,7 @@ class GCodeMacro extends StampedEntity {
       this.visible = true,
       this.showWhilePrinting = true})
       : uuid = uuid ?? Uuid().v4(),
-        super(created ?? DateTime.now(), lastModified ?? DateTime.now());
+        super(created, lastModified ?? DateTime.now());
 
   @JsonKey(required: true)
   String name;

lib/domain/moonraker/machine_settings.dart

@@ -9,8 +9,8 @@ part 'machine_settings.g.dart';
 @JsonSerializable()
 class MachineSettings extends StampedEntity {
   MachineSettings(
-      {required DateTime created,
-      required DateTime lastModified,
+      {DateTime? created,
+      DateTime? lastModified,
       this.temperaturePresets = const [],
       this.inverts = const [false, false, false],
       this.speedXY = 100,
@@ -20,7 +20,7 @@ class MachineSettings extends StampedEntity {
       this.babySteps = const [0.005, 0.01, 0.05, 0.1],
       this.extrudeSteps = const [1, 10, 25, 50],
       this.macroGroups = const []})
-      : super(created, lastModified);
+      : super(created, lastModified ?? DateTime.now());
 
   MachineSettings.fallback()
       : this(created: DateTime.now(), lastModified: DateTime.now());

lib/domain/moonraker/macro_group.dart

@@ -15,7 +15,7 @@ class MacroGroup extends StampedEntity {
     String? uuid,
     this.macros = const [],
   })  : uuid = uuid ?? Uuid().v4(),
-        super(created ?? DateTime.now(), lastModified ?? DateTime.now());
+        super(created, lastModified ?? DateTime.now());
 
   String name;
   final String uuid;

lib/domain/moonraker/stamped_entity.dart

@@ -1,5 +1,6 @@
 class StampedEntity {
-  StampedEntity(this.created, this.lastModified);
+  StampedEntity(DateTime? created, this.lastModified)
+      : created = created ?? DateTime.now();
 
   final DateTime created;
   DateTime lastModified;
@@ -14,6 +15,4 @@ class StampedEntity {
 
   @override
   int get hashCode => created.hashCode ^ lastModified.hashCode;
-
-
 }

lib/domain/moonraker/temperature_preset.dart

@@ -15,7 +15,7 @@ class TemperaturePreset extends StampedEntity {
     this.bedTemp = 60,
     this.extruderTemp = 170,
   })  : uuid = uuid ?? Uuid().v4(),
-        super(created ?? DateTime.now(), lastModified ?? DateTime.now());
+        super(created, lastModified ?? DateTime.now());
 
   String name;
   final String uuid;

lib/service/machine_service.dart

@@ -4,10 +4,10 @@ import 'package:hive/hive.dart';
 import 'package:mobileraker/app/app_setup.locator.dart';
 import 'package:mobileraker/app/app_setup.logger.dart';
 import 'package:mobileraker/datasource/moonraker_database_client.dart';
-import 'package:mobileraker/domain/hive/gcode_macro.dart';
 import 'package:mobileraker/domain/hive/machine.dart';
-import 'package:mobileraker/domain/hive/macro_group.dart';
+import 'package:mobileraker/domain/moonraker/gcode_macro.dart';
 import 'package:mobileraker/domain/moonraker/machine_settings.dart';
+import 'package:mobileraker/domain/moonraker/macro_group.dart';
 import 'package:mobileraker/repository/machine_hive_repository.dart';
 import 'package:mobileraker/repository/machine_settings_moonraker_repository.dart';
 import 'package:mobileraker/service/selected_machine_service.dart';
@@ -156,11 +156,12 @@ class MachineService {
     return i;
   }
 
-  updateSettingMacros(Machine machine, List<String> macros) {
+  updateMacrosInSettings(Machine machine, List<String> macros) async {
     _logger.i("Updating Default Macros!");
+    MachineSettings machineSettings = await fetchSettings(machine);
     List<String> filteredMacros =
         macros.where((element) => !element.startsWith('_')).toList();
-    List<MacroGroup> macroGroups = machine.macroGroups;
+    List<MacroGroup> macroGroups = machineSettings.macroGroups;
     for (MacroGroup grp in macroGroups) {
       for (GCodeMacro macro in grp.macros) {
         filteredMacros.remove(macro.name);
@@ -174,7 +175,7 @@ class MachineService {
       return group;
     });
 
-    defaultGroup.macros.addAll(filteredMacros.map((e) => GCodeMacro(e)));
+    defaultGroup.macros.addAll(filteredMacros.map((e) => GCodeMacro(name: e)));
   }
 
   dispose() {

lib/service/moonraker/printer_service.dart

@@ -286,7 +286,7 @@ class PrinterService {
     });
     printer.queryableObjects = qObjects;
     printer.gcodeMacros = gCodeMacros;
-    _machineService.updateSettingMacros(_owner, gCodeMacros);
+    _machineService.updateMacrosInSettings(_owner, gCodeMacros);
     _queryPrinterObjects(printer);
   }
 

lib/ui/views/dashboard/tabs/control_tab.dart

@@ -360,10 +360,13 @@ class GcodeMacroCard extends ViewModelWidget<ControlTabViewModel> {
         GCodeMacro macro = macros[index];
         bool disabled = (!model.canUsePrinter ||
             (model.isPrinting && !macro.showWhilePrinting));
-        return ActionChip(
-          label: Text(macro.beautifiedName),
-          backgroundColor: disabled ? themeData.disabledColor : bgColActive,
-          onPressed: () => disabled ? null : model.onMacroPressed(macro),
+        return Visibility(
+          visible: model.printer.gcodeMacros.contains(macro.name) && macro.visible,
+          child: ActionChip(
+            label: Text(macro.beautifiedName),
+            backgroundColor: disabled ? themeData.disabledColor : bgColActive,
+            onPressed: () => disabled ? null : model.onMacroPressed(macro),
+          ),
         );
       },
     ).toList();

lib/ui/views/printers/edit/printers_edit_viewmodel.dart

@@ -447,6 +447,7 @@ class PrinterEditViewModel extends MultipleFutureViewModel {
     // printerApiKey = resu;
   }
 
+
   _buildMacroGroups() {
     _macroGroups.addAll(machineSettings.macroGroups);
     MacroGroup defaultGroup = _defaultGroup;
@@ -472,7 +473,10 @@ class PrinterEditViewModel extends MultipleFutureViewModel {
   _saveMacroGroup(MacroGroup toSave) {
     _fbKey.currentState?.save();
     var name = _fbKey.currentState!.value['${toSave.uuid}-macroName'];
-    if (name != null) toSave.name = name;
+    if (name != null)
+      toSave
+        ..name = name
+        ..lastModified = DateTime.now();
   }
 
   _saveAllCams() {
@@ -510,6 +514,8 @@ class PrinterEditViewModel extends MultipleFutureViewModel {
     if (name != null) toSave.name = name;
     if (extruderTemp != null) toSave.extruderTemp = extruderTemp;
     if (bedTemp != null) toSave.bedTemp = bedTemp;
+    if ((bedTemp ?? extruderTemp ?? name ?? extruderTemp) != null)
+      toSave.lastModified = DateTime.now();
   }
 
   _saveAllGroupStuff() {