Gardening.

src/tools/builder/src/python/builder.py

@@ -117,25 +117,26 @@ def get_available_components(self):
 
         return json.dumps(blueprints)
 
-    def add_component(self, parent_id, component_klass_name):
+    def append_component(self, parent_id, component_type_name):
         """
-        Add a component to the end of the specified page.
+        Append a component to the specified parent.
         """
         parent = self._app.get_component_by_id(parent_id)
         if parent is None:
             raise ValueError(f"No such container: {parent_id}")
 
-        component = create_component(component_klass_name)
-        self.insert_after(parent.content[-1], component)
+        self.insert_component_after(parent.content[-1], component_type_name)
 
-    def insert_after(self, after_component, component):
+    def insert_component_after(self, after_component, component_type_name):
         """
         Insert a component after another (as a sibling).
         """
 
         parent = after_component.parent
         after_component_index = parent.content.index(after_component)
 
+        component = create_component(component_type_name)
+
         if after_component_index == len(parent.content) - 1:
             parent.append(component)
             parent.append(BuilderDropZone(self))
@@ -287,14 +288,15 @@ def on_drop(self, event):
         event.preventDefault()
         event.stopPropagation()
         self.element.classList.remove("drop-zone-active")
-
         component_blueprint = json.loads(event.dataTransfer.getData("widget"))
-        component = create_component(component_blueprint["name"])
-        self.builder.insert_after(after_component=self, component=component)
+
+        self.builder.insert_component_after(
+            after_component=self, component_type_name=component_blueprint["name"]
+        )
 
     def render(self):
         """
-        Render the component's HTML element.
+        Create the component's HTML element.
         """
         element = document.createElement("div")
         element.id = self.id

src/tools/builder/src/utilities/builder-utilities.ts

@@ -33,8 +33,8 @@ export class BuilderUtilities {
 
 	// Components //////////////////////////////////////////////////////////////////////
 
-	public static addComponent(parentId: string, componentTypeName: string): void {
-		this.builder().add_component(parentId, componentTypeName);
+	public static appendComponent(parentId: string, componentTypeName: string): void {
+		this.builder().append_component(parentId, componentTypeName);
 	}
 
 	public static deleteComponent(componentId: string) {

src/tools/builder/src/views/builder/builder-model.ts

@@ -86,7 +86,7 @@ export class BuilderModel extends ViewModelBase {
 			}
 		});
 	}
-	
+
 	/**
 	 * Called when a page button is clicked.
 	 */
@@ -116,7 +116,7 @@ export class BuilderModel extends ViewModelBase {
 			}
 		}
 
-		BuilderUtilities.addComponent(parentId, widgetBlueprint.name);
+		BuilderUtilities.appendComponent(parentId, widgetBlueprint.name);
 	}
 
 	/**
@@ -125,15 +125,13 @@ export class BuilderModel extends ViewModelBase {
 	 * This is called from the Python-side of the view model.
 	 */
 	public onComponentClicked(componentBlueprint: any, component: any) {
-		this.state.activeWidgetId = component.id;
 		this.openPropertiesForWidget(componentBlueprint, component.id);
 	}
 
 	public openPropertiesForWidget(widgetBlueprint: WidgetModel, componentId: string): void {
-		this.state.activeWidgetProperties = BuilderUtilities.getComponentProperties(
-			componentId
-		);
+		this.state.activeWidgetId = componentId;
 		this.state.activeWidgetBlueprint = widgetBlueprint;
+		this.state.activeWidgetProperties = BuilderUtilities.getComponentProperties(componentId);
 	}
 
 	public updateComponentProperty(key: string, value: string, isFromDatastore?: boolean) {