Layout Groups #6

- Refactor conditions and variables model for publishing.

Author: BirjuVachhani

lib/src/model/sdk_publish_model.dart

@@ -471,11 +471,12 @@ class SDKPublishUpdates with EquatableMixin {
 /// A model that defines variables for a layout.
 @JsonSerializable()
 class SDKLayoutVariables extends PrivacyBase {
-  /// The id of the canvas. Can be layout id for backwards compatibility.
+  /// The id of the layout.
   final String id;
 
   /// The variables that are defined for this layout.
-  final Map<String, VariableData> variables;
+  /// CanvasID -> (VariableID -> VariableData)
+  final Map<String, Map<String, VariableData>> variables;
 
   /// Creates a new instance of [SDKLayoutVariables].
   const SDKLayoutVariables({
@@ -492,7 +493,7 @@ class SDKLayoutVariables extends PrivacyBase {
   /// copyWith
   SDKLayoutVariables copyWith({
     String? id,
-    Map<String, VariableData>? variables,
+    Map<String, Map<String, VariableData>>? variables,
     String? owner,
     Set<String>? editors,
     Set<String>? viewers,
@@ -524,11 +525,12 @@ class SDKLayoutVariables extends PrivacyBase {
 /// A model that defines variables for a layout.
 @JsonSerializable()
 class SDKLayoutConditions extends PrivacyBase {
-  /// The id of the canvas. Can be layout id for backwards compatibility.
+  /// The id of the layout.
   final String id;
 
   /// The conditions that are defined for this layout.
-  final Map<String, BaseCondition> conditions;
+  /// CanvasID -> (ConditionID -> ConditionData)
+  final Map<String, Map<String, BaseCondition>> conditions;
 
   /// Creates a new instance of [SDKLayoutConditions].
   const SDKLayoutConditions({
@@ -545,7 +547,7 @@ class SDKLayoutConditions extends PrivacyBase {
   /// copyWith
   SDKLayoutConditions copyWith({
     String? id,
-    Map<String, BaseCondition>? conditions,
+    Map<String, Map<String, BaseCondition>>? conditions,
     String? owner,
     Set<String>? editors,
     Set<String>? viewers,

lib/src/model/sdk_publish_model.g.dart

@@ -205,9 +205,7 @@ class _CodelesslyLayoutBuilderState extends State<CodelesslyLayoutBuilder> {
 
     // Uses layout id for backwards compatibility.
     final Map<String, VariableData> variablesMap =
-        (publishModel.variables[widget.canvasId] ??
-                    publishModel.variables[widget.layout.id])
-                ?.variables ??
+        publishModel.variables[widget.layout.id]?.variables[widget.canvasId] ??
             {};
 
     // Clear all the variables that are not api variables. We persist api
@@ -224,9 +222,8 @@ class _CodelesslyLayoutBuilderState extends State<CodelesslyLayoutBuilder> {
     }
 
     // Uses layout id for backwards compatibility.
-    final conditions = (publishModel.conditions[widget.canvasId] ??
-                publishModel.conditions[widget.layout.id])
-            ?.conditions ??
+    final conditions = publishModel
+            .conditions[widget.layout.id]?.conditions[widget.canvasId] ??
         {};
     codelesslyContext.conditions.clear();
     codelesslyContext.conditions.addAll(conditions);