From be4cdd81e4b4bbfd7c229e044bb458d734aed00e Mon Sep 17 00:00:00 2001
From: Joshua Edward <oghenerobojosh01@gmail.com>
Date: Fri, 22 May 2026 11:29:46 +0100
Subject: [PATCH 01/21] Add asset copy functionality with tabbed interface in
 asset creation form

Signed-off-by: Joshua Edward <oghenerobojosh01@gmail.com>
---
 .../ui/templates/assets/asset_new.html        | 170 +++++++++++++++++-
 flexmeasures/ui/views/assets/views.py         |   7 +
 2 files changed, 175 insertions(+), 2 deletions(-)

diff --git a/flexmeasures/ui/templates/assets/asset_new.html b/flexmeasures/ui/templates/assets/asset_new.html
index e7ba554fa2..14f8e75ef8 100644
--- a/flexmeasures/ui/templates/assets/asset_new.html
+++ b/flexmeasures/ui/templates/assets/asset_new.html
@@ -7,9 +7,28 @@
 {% block divs %}
 
 <div class="container-fluid">
-    
+
     <h3>Creating a new asset {% if parent_asset_name %} under asset <a href="/assets/{{parent_asset_id}}">{{ parent_asset_name }}</a> {% endif %}</h3>
-    
+
+    <!-- Tab navigation -->
+    <ul class="nav nav-tabs mb-3" id="newAssetTabs" role="tablist">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link active" id="create-new-tab" data-bs-toggle="tab"
+                data-bs-target="#create-new" type="button" role="tab"
+                aria-controls="create-new" aria-selected="true">Create new</button>
+        </li>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" id="copy-asset-tab" data-bs-toggle="tab"
+                data-bs-target="#copy-asset" type="button" role="tab"
+                aria-controls="copy-asset" aria-selected="false">Copy an existing</button>
+        </li>
+    </ul>
+
+    <div class="tab-content" id="newAssetTabContent">
+
+        <!-- Tab 1: Create new asset form -->
+        <div class="tab-pane fade show active" id="create-new" role="tabpanel" aria-labelledby="create-new-tab">
+
     <form class="new-asset-form form-horizontal" method="POST" action="/assets/create">
         {{ asset_form.csrf_token }}
         {{ asset_form.hidden_tag() }}
@@ -108,6 +127,45 @@ <h3>Location</h3>
             </div>
         </fieldset>
     </form>
+
+        </div><!-- end #create-new tab pane -->
+
+        <!-- Tab 2: Copy an existing asset -->
+        <div class="tab-pane fade" id="copy-asset" role="tabpanel" aria-labelledby="copy-asset-tab">
+
+            <div class="row mb-3 mt-3">
+                <div class="col-md-5">
+                    <input type="text" id="copySearchInput" class="form-control"
+                        placeholder="Search assets…">
+                </div>
+                <div class="col-md-3">
+                    <select id="copyAssetTypeSelect" class="form-select">
+                        <option value="">All types</option>
+                        {% for at in asset_types %}
+                        <option value="{{ at.id }}">{{ at.name }}</option>
+                        {% endfor %}
+                    </select>
+                </div>
+                <div class="col-md-4 d-flex align-items-center">
+                    <div class="form-check">
+                        <input class="form-check-input" type="checkbox" id="copyIncludePublic" checked>
+                        <label class="form-check-label" for="copyIncludePublic">Include public assets</label>
+                    </div>
+                </div>
+            </div>
+
+            <div id="copyAssetsSpinner" class="justify-content-center my-4 d-none">
+                <div class="spinner-border text-primary" role="status">
+                    <span class="visually-hidden">Loading…</span>
+                </div>
+            </div>
+
+            <div id="copyAssetsResults" class="row row-cols-1 row-cols-sm-2 row-cols-lg-4 g-1 my-2"></div>
+
+        </div><!-- end #copy-asset tab pane -->
+
+    </div><!-- end .tab-content -->
+
 </div>
 
 <!-- Initialise the map -->
@@ -174,4 +232,112 @@ <h3>Location</h3>
 
 </script>
 
+<script type="module">
+        import {getAccount} from "{{ url_for('flexmeasures_ui.static', filename='js/ui-utils.js') }}?v={{ flexmeasures_version }}";
+
+
+(function () {
+    var parentAssetId = "{{ parent_asset_id }}";
+
+    async function searchAssetsForCopy() {
+        var filter = document.getElementById("copySearchInput").value;
+        var assetTypeId = document.getElementById("copyAssetTypeSelect").value;
+        var includePublic = document.getElementById("copyIncludePublic").checked;
+
+        var params = new URLSearchParams({ page: 1, per_page: 100 });
+        if (filter) params.set("filter", filter);
+        if (assetTypeId) params.set("generic_asset_type_id", assetTypeId);
+        if (includePublic) params.set("include_public_assets", "true");
+
+        var spinner = document.getElementById("copyAssetsSpinner");
+        var results = document.getElementById("copyAssetsResults");
+        spinner.classList.remove("d-none");
+        spinner.classList.add("d-flex");
+        results.innerHTML = "";
+
+        try {
+            var response = await fetch("/api/v3_0/assets?" + params.toString(), {
+                credentials: "same-origin",
+            });
+            if (!response.ok) throw new Error(response.statusText || "Request failed");
+            var data = await response.json();
+            renderCopyResults(data.data || []);
+        } catch (err) {
+            showToast("Failed to search assets: " + err.message, "error");
+        } finally {
+            spinner.classList.remove("d-flex");
+            spinner.classList.add("d-none");
+        }
+    }
+
+    function renderCopyResults(assets) {
+        var container = document.getElementById("copyAssetsResults");
+        container.innerHTML = "";
+        if (!assets.length) {
+            container.innerHTML = '<p class="text-muted">No assets found.</p>';
+            return;
+        }
+        assets.forEach(async function (asset) {
+            const account = asset.account_id ? await getAccount(asset.account_id) : null;
+            var col = document.createElement("div");
+            col.className = "col";
+            var accountLabel = account
+                ? account.name + " (Acct ID: " + account.id + ")"
+                : "Public";
+            col.innerHTML =
+                '<div class="d-flex justify-content-between align-items-center border rounded px-2 py-1">' +
+                '<div class="me-2 text-truncate">' +
+                '<div class="fw-semibold text-truncate">' + escapeHtml(asset.name) + '</div>' +
+                '<div class="text-muted small text-truncate">' + accountLabel + '</div>' +
+                '</div>' +
+                '<button class="btn btn-sm btn-primary js-copy-from-tab-btn"' +
+                ' data-asset-id="' + asset.id + '">Copy</button>' +
+                '</div>';
+            container.appendChild(col);
+            // Attach listener after button is added to DOM
+            var btn = col.querySelector(".js-copy-from-tab-btn");
+            btn.addEventListener("click", function () {
+                var assetId = btn.dataset.assetId;
+                var url = "/api/v3_0/assets/" + assetId + "/copy";
+                if (parentAssetId) url += "?parent_id=" + parentAssetId;
+                btn.disabled = true;
+                showToast("Creating asset from template…", "info");
+                fetch(url, { method: "POST", credentials: "same-origin" })
+                    .then(function (r) {
+                        if (!r.ok) return r.json().then(function (e) { throw new Error(e.message || r.statusText); });
+                        return r.json();
+                    })
+                    .then(function (data) {
+                        showToast("Asset created successfully.", "success");
+                        setTimeout(function () {
+                            window.location.href = "/assets/" + data.asset + "/properties";
+                        }, 2000);
+                    })
+                    .catch(function (err) {
+                        showToast("Failed to create asset: " + err.message, "error");
+                        btn.disabled = false;
+                    });
+            });
+        });
+    }
+
+    function escapeHtml(text) {
+        var d = document.createElement("div");
+        d.appendChild(document.createTextNode(text));
+        return d.innerHTML;
+    }
+
+    document.getElementById("copySearchInput").addEventListener("input", searchAssetsForCopy);
+    document.getElementById("copyAssetTypeSelect").addEventListener("change", searchAssetsForCopy);
+    document.getElementById("copyIncludePublic").addEventListener("change", searchAssetsForCopy);
+
+    // Run initial search when the tab is first shown
+    document.getElementById("copy-asset-tab").addEventListener("shown.bs.tab", function () {
+        if (document.getElementById("copyAssetsResults").innerHTML === "") {
+            searchAssetsForCopy();
+        }
+    });
+}());
+</script>
+
 {% endblock %}
\ No newline at end of file
diff --git a/flexmeasures/ui/views/assets/views.py b/flexmeasures/ui/views/assets/views.py
index 384661fa6e..0fe4cbbbb7 100644
--- a/flexmeasures/ui/views/assets/views.py
+++ b/flexmeasures/ui/views/assets/views.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import json
+from sqlalchemy import select
 from flask import redirect, url_for, current_app, request, session
 from flask_classful import FlaskView, route
 from flask_security import login_required, current_user
@@ -18,6 +19,7 @@
 )
 from flexmeasures.data.models.generic_assets import (
     GenericAsset,
+    GenericAssetType,
     get_bounding_box_of_assets,
 )
 from flexmeasures.data.schemas.generic_assets import GenericAssetSchema as AssetSchema
@@ -147,6 +149,10 @@ def get(self, id: str, **kwargs):
             if account:  # Pre-set account
                 asset_form.account_id.data = str(account.id)
 
+            asset_types = db.session.scalars(
+                select(GenericAssetType).order_by(GenericAssetType.name)
+            ).all()
+
             return render_flexmeasures_template(
                 "assets/asset_new.html",
                 asset_form=asset_form,
@@ -157,6 +163,7 @@ def get(self, id: str, **kwargs):
                 parent_asset_name=parent_asset_name,
                 parent_asset_id=parent_asset_id,
                 account=account,
+                asset_types=asset_types,
             )
 
         # otherwise, redirect to the default asset view

From f5aa38b49c8e302ffd0a610b0ccd6c92fda0c505 Mon Sep 17 00:00:00 2001
From: Joshua Edward <oghenerobojosh01@gmail.com>
Date: Fri, 22 May 2026 12:19:18 +0100
Subject: [PATCH 02/21] feat: Enhance asset copy tab with infinite scroll and
 loading indicators

Signed-off-by: Joshua Edward <oghenerobojosh01@gmail.com>
---
 .../ui/templates/assets/asset_new.html        | 242 +++++++++++++++---
 1 file changed, 202 insertions(+), 40 deletions(-)

diff --git a/flexmeasures/ui/templates/assets/asset_new.html b/flexmeasures/ui/templates/assets/asset_new.html
index 14f8e75ef8..a64fe5d0aa 100644
--- a/flexmeasures/ui/templates/assets/asset_new.html
+++ b/flexmeasures/ui/templates/assets/asset_new.html
@@ -161,6 +161,13 @@ <h3>Location</h3>
             </div>
 
             <div id="copyAssetsResults" class="row row-cols-1 row-cols-sm-2 row-cols-lg-4 g-1 my-2"></div>
+            <div id="copyAssetsStatus" class="small text-muted my-1"></div>
+            <div id="copyAssetsBottomSpinner" class="justify-content-center my-2 d-none">
+                <div class="spinner-border spinner-border-sm text-primary" role="status">
+                    <span class="visually-hidden">Loading more…</span>
+                </div>
+            </div>
+            <div id="copyAssetsSentinel" class="w-100 py-2"></div>
 
         </div><!-- end #copy-asset tab pane -->
 
@@ -233,72 +240,178 @@ <h3>Location</h3>
 </script>
 
 <script type="module">
-        import {getAccount} from "{{ url_for('flexmeasures_ui.static', filename='js/ui-utils.js') }}?v={{ flexmeasures_version }}";
-
+import { getAccount } from "{{ url_for('flexmeasures_ui.static', filename='js/ui-utils.js') }}?v={{ flexmeasures_version }}";
 
 (function () {
-    var parentAssetId = "{{ parent_asset_id }}";
+    const parentAssetId = "{{ parent_asset_id }}";
+    const perPage = 100;
+    let currentPage = 1;
+    let loadedAssetCount = 0;
+    let hasMore = true;
+    let isLoading = false;
+    let hasInitializedCopyTab = false;
+    let searchDebounceTimer = null;
+    let totalFilteredRecords = null;
+    let observer = null;
+    let activeSearchToken = 0;
+    const renderedAssetIds = new Set();
+    const accountNameCache = new Map();
+
+    const spinner = document.getElementById("copyAssetsSpinner");
+    const bottomSpinner = document.getElementById("copyAssetsBottomSpinner");
+    const results = document.getElementById("copyAssetsResults");
+    const status = document.getElementById("copyAssetsStatus");
+    const sentinel = document.getElementById("copyAssetsSentinel");
+
+    function toggleSpinner(show) {
+        if (show) {
+            spinner.classList.remove("d-none");
+            spinner.classList.add("d-flex");
+        } else {
+            spinner.classList.remove("d-flex");
+            spinner.classList.add("d-none");
+        }
+    }
+
+    function toggleBottomSpinner(show) {
+        if (show) {
+            bottomSpinner.classList.remove("d-none");
+            bottomSpinner.classList.add("d-flex");
+        } else {
+            bottomSpinner.classList.remove("d-flex");
+            bottomSpinner.classList.add("d-none");
+        }
+    }
 
-    async function searchAssetsForCopy() {
-        var filter = document.getElementById("copySearchInput").value;
-        var assetTypeId = document.getElementById("copyAssetTypeSelect").value;
-        var includePublic = document.getElementById("copyIncludePublic").checked;
+    function setStatusMessage(message) {
+        status.textContent = message || "";
+    }
 
-        var params = new URLSearchParams({ page: 1, per_page: 100 });
+    function resetSearchState() {
+        activeSearchToken += 1;
+        currentPage = 1;
+        loadedAssetCount = 0;
+        hasMore = true;
+        isLoading = false;
+        totalFilteredRecords = null;
+        renderedAssetIds.clear();
+        results.innerHTML = "";
+        setStatusMessage("");
+        toggleBottomSpinner(false);
+    }
+
+    function getSearchParams(page) {
+        const filter = document.getElementById("copySearchInput").value;
+        const assetTypeId = document.getElementById("copyAssetTypeSelect").value;
+        const includePublic = document.getElementById("copyIncludePublic").checked;
+
+        const params = new URLSearchParams({ page: page, per_page: perPage });
         if (filter) params.set("filter", filter);
         if (assetTypeId) params.set("generic_asset_type_id", assetTypeId);
         if (includePublic) params.set("include_public_assets", "true");
+        // Ensure stable ordering across pages to avoid page-overlap duplicates.
+        params.set("sort_by", "id");
+        params.set("sort_dir", "asc");
+        return params;
+    }
 
-        var spinner = document.getElementById("copyAssetsSpinner");
-        var results = document.getElementById("copyAssetsResults");
-        spinner.classList.remove("d-none");
-        spinner.classList.add("d-flex");
-        results.innerHTML = "";
+    async function searchAssetsForCopy(reset) {
+        if (reset) {
+            resetSearchState();
+        }
+        if (isLoading || !hasMore) {
+            return;
+        }
+
+        isLoading = true;
+        if (reset) {
+            toggleSpinner(true);
+            toggleBottomSpinner(false);
+        } else {
+            toggleBottomSpinner(true);
+        }
+        const requestToken = activeSearchToken;
+        const params = getSearchParams(currentPage);
 
         try {
-            var response = await fetch("/api/v3_0/assets?" + params.toString(), {
+            const response = await fetch("/api/v3_0/assets?" + params.toString(), {
                 credentials: "same-origin",
             });
             if (!response.ok) throw new Error(response.statusText || "Request failed");
-            var data = await response.json();
-            renderCopyResults(data.data || []);
+            const data = await response.json();
+            if (requestToken !== activeSearchToken) {
+                return;
+            }
+            const assets = data.data || [];
+            totalFilteredRecords = data["filtered-records"];
+
+            if (!assets.length && currentPage === 1) {
+                setStatusMessage("No assets found.");
+                hasMore = false;
+                return;
+            }
+
+            renderCopyResults(assets);
+            loadedAssetCount += assets.length;
+
+            if (
+                assets.length < perPage ||
+                (typeof totalFilteredRecords === "number" &&
+                    loadedAssetCount >= totalFilteredRecords)
+            ) {
+                hasMore = false;
+                setStatusMessage("Nothing more to load.");
+            } else {
+                currentPage += 1;
+                setStatusMessage("Scroll down to load more.");
+            }
         } catch (err) {
             showToast("Failed to search assets: " + err.message, "error");
+            setStatusMessage("Failed to load assets.");
         } finally {
-            spinner.classList.remove("d-flex");
-            spinner.classList.add("d-none");
+            isLoading = false;
+            toggleSpinner(false);
+            toggleBottomSpinner(false);
         }
     }
 
     function renderCopyResults(assets) {
-        var container = document.getElementById("copyAssetsResults");
-        container.innerHTML = "";
-        if (!assets.length) {
-            container.innerHTML = '<p class="text-muted">No assets found.</p>';
-            return;
-        }
-        assets.forEach(async function (asset) {
-            const account = asset.account_id ? await getAccount(asset.account_id) : null;
-            var col = document.createElement("div");
+        const container = document.getElementById("copyAssetsResults");
+        assets.forEach(function (asset) {
+            if (renderedAssetIds.has(asset.id)) {
+                return;
+            }
+            renderedAssetIds.add(asset.id);
+            const col = document.createElement("div");
             col.className = "col";
-            var accountLabel = account
-                ? account.name + " (Acct ID: " + account.id + ")"
+            const accountLabel = asset.account_id
+                ? "Organisation #" + asset.account_id
                 : "Public";
             col.innerHTML =
                 '<div class="d-flex justify-content-between align-items-center border rounded px-2 py-1">' +
                 '<div class="me-2 text-truncate">' +
-                '<div class="fw-semibold text-truncate">' + escapeHtml(asset.name) + '</div>' +
-                '<div class="text-muted small text-truncate">' + accountLabel + '</div>' +
+                '<div class="fw-semibold text-truncate">' + escapeHtml(asset.name) + ' (ID:' + asset.id + ')</div>' +
+                '<div class="text-muted small text-truncate js-account-label">' + accountLabel + '</div>' +
                 '</div>' +
                 '<button class="btn btn-sm btn-primary js-copy-from-tab-btn"' +
                 ' data-asset-id="' + asset.id + '">Copy</button>' +
                 '</div>';
             container.appendChild(col);
+
+            if (asset.account_id) {
+                getAccountLabel(asset.account_id).then(function (label) {
+                    const accountLabelEl = col.querySelector(".js-account-label");
+                    if (accountLabelEl) {
+                        accountLabelEl.textContent = label;
+                    }
+                });
+            }
+
             // Attach listener after button is added to DOM
-            var btn = col.querySelector(".js-copy-from-tab-btn");
+            const btn = col.querySelector(".js-copy-from-tab-btn");
             btn.addEventListener("click", function () {
-                var assetId = btn.dataset.assetId;
-                var url = "/api/v3_0/assets/" + assetId + "/copy";
+                const assetId = btn.dataset.assetId;
+                let url = "/api/v3_0/assets/" + assetId + "/copy";
                 if (parentAssetId) url += "?parent_id=" + parentAssetId;
                 btn.disabled = true;
                 showToast("Creating asset from template…", "info");
@@ -321,20 +434,69 @@ <h3>Location</h3>
         });
     }
 
+    function initInfiniteScroll() {
+        if (observer) {
+            observer.disconnect();
+        }
+        observer = new IntersectionObserver(
+            function (entries) {
+                entries.forEach(function (entry) {
+                    if (entry.isIntersecting) {
+                        searchAssetsForCopy(false);
+                    }
+                });
+            },
+            {
+                root: null,
+                rootMargin: "200px 0px",
+                threshold: 0,
+            },
+        );
+        observer.observe(sentinel);
+    }
+
+    function triggerNewSearch() {
+        clearTimeout(searchDebounceTimer);
+        searchDebounceTimer = setTimeout(function () {
+            searchAssetsForCopy(true);
+        }, 250);
+    }
+
+    async function getAccountLabel(accountId) {
+        if (!accountId) {
+            return "Public";
+        }
+        if (accountNameCache.has(accountId)) {
+            return accountNameCache.get(accountId);
+        }
+        try {
+            const account = await getAccount(accountId);
+            const label = account && account.name
+                ? account.name + " (ID:" + account.id + ")"
+                : "Organisation (ID:" + accountId + ")";
+            accountNameCache.set(accountId, label);
+            return label;
+        } catch (e) {
+            return "Organisation (ID:" + accountId + ")";
+        }
+    }
+
     function escapeHtml(text) {
-        var d = document.createElement("div");
+        const d = document.createElement("div");
         d.appendChild(document.createTextNode(text));
         return d.innerHTML;
     }
 
-    document.getElementById("copySearchInput").addEventListener("input", searchAssetsForCopy);
-    document.getElementById("copyAssetTypeSelect").addEventListener("change", searchAssetsForCopy);
-    document.getElementById("copyIncludePublic").addEventListener("change", searchAssetsForCopy);
+    document.getElementById("copySearchInput").addEventListener("input", triggerNewSearch);
+    document.getElementById("copyAssetTypeSelect").addEventListener("change", triggerNewSearch);
+    document.getElementById("copyIncludePublic").addEventListener("change", triggerNewSearch);
 
     // Run initial search when the tab is first shown
     document.getElementById("copy-asset-tab").addEventListener("shown.bs.tab", function () {
-        if (document.getElementById("copyAssetsResults").innerHTML === "") {
-            searchAssetsForCopy();
+        if (!hasInitializedCopyTab) {
+            hasInitializedCopyTab = true;
+            initInfiniteScroll();
+            searchAssetsForCopy(true);
         }
     });
 }());

From d2c94fed923adf36bbe6d11d28da96b93e891c4b Mon Sep 17 00:00:00 2001
From: JDev <45713692+joshuaunity@users.noreply.github.com>
Date: Mon, 25 May 2026 04:59:54 +0100
Subject: [PATCH 03/21] Update flexmeasures/ui/templates/assets/asset_new.html
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Nicolas Höning <nicolas@seita.nl>
Signed-off-by: JDev <45713692+joshuaunity@users.noreply.github.com>
---
 flexmeasures/ui/templates/assets/asset_new.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flexmeasures/ui/templates/assets/asset_new.html b/flexmeasures/ui/templates/assets/asset_new.html
index a64fe5d0aa..9a55309979 100644
--- a/flexmeasures/ui/templates/assets/asset_new.html
+++ b/flexmeasures/ui/templates/assets/asset_new.html
@@ -20,7 +20,7 @@ <h3>Creating a new asset {% if parent_asset_name %} under asset <a href="/assets
         <li class="nav-item" role="presentation">
             <button class="nav-link" id="copy-asset-tab" data-bs-toggle="tab"
                 data-bs-target="#copy-asset" type="button" role="tab"
-                aria-controls="copy-asset" aria-selected="false">Copy an existing</button>
+                aria-controls="copy-asset" aria-selected="false">Copy existing</button>
         </li>
     </ul>
 

From 609425b2b36cd9c6d6a8c48eb0a262ad78c514c1 Mon Sep 17 00:00:00 2001
From: Joshua Edward <oghenerobojosh01@gmail.com>
Date: Mon, 25 May 2026 06:41:13 +0100
Subject: [PATCH 04/21] feat: Add asset type filtering to asset API and update
 UI parameters

Signed-off-by: Joshua Edward <oghenerobojosh01@gmail.com>
---
 flexmeasures/api/common/schemas/assets.py     |  9 ++++++
 flexmeasures/api/v3_0/assets.py               |  6 ++++
 .../api/v3_0/tests/test_assets_api.py         | 28 +++++++++++++++++++
 .../ui/templates/assets/asset_new.html        |  5 ++--
 4 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/flexmeasures/api/common/schemas/assets.py b/flexmeasures/api/common/schemas/assets.py
index 8648b5517f..9c0200b0a4 100644
--- a/flexmeasures/api/common/schemas/assets.py
+++ b/flexmeasures/api/common/schemas/assets.py
@@ -92,6 +92,15 @@ class AssetAPIQuerySchema(PaginationSchema):
             example=False,
         ),
     )
+    asset_type = fields.Int(
+        data_key="asset_type",
+        required=False,
+        validate=validate.Range(min=1),
+        metadata=dict(
+            description="Filter assets by generic asset type ID.",
+            example=2,
+        ),
+    )
 
 
 class PublicAssetAPISchema(Schema):
diff --git a/flexmeasures/api/v3_0/assets.py b/flexmeasures/api/v3_0/assets.py
index 27b79c49cd..00a01122d0 100644
--- a/flexmeasures/api/v3_0/assets.py
+++ b/flexmeasures/api/v3_0/assets.py
@@ -267,6 +267,7 @@ def index(
         fields_in_response: list[str] | None,
         all_accessible: bool,
         include_public: bool,
+        asset_type: int | None = None,
         account: Account | None = None,
         root_asset: GenericAsset | None = None,
         max_depth: int | None = None,
@@ -287,6 +288,7 @@ def index(
               - The `account_id` query parameter can be used to list assets from any account (if the user is allowed to read them). Per default, the user's account is used.
               - Alternatively, the `all_accessible` query parameter can be used to list assets from all accounts the current_user has read-access to, plus all public assets. Defaults to `false`.
               - The `include_public` query parameter can be used to include public assets in the response. Defaults to `false`.
+              - The `asset_type` query parameter can be used to filter by generic asset type ID.
               - The `root` query parameter can be used to list only descendants of a given root asset (including the root itself).
               - The `depth` query parameter can be used to search only a max number of descendant generations from the root.
 
@@ -363,6 +365,10 @@ def index(
         filter_statement = GenericAsset.account_id.in_(account_ids)
         if include_public:
             filter_statement = filter_statement | GenericAsset.account_id.is_(None)
+        if asset_type is not None:
+            filter_statement = filter_statement & (
+                GenericAsset.generic_asset_type_id == asset_type
+            )
 
         query = query_assets_by_search_terms(
             search_terms=filter,
diff --git a/flexmeasures/api/v3_0/tests/test_assets_api.py b/flexmeasures/api/v3_0/tests/test_assets_api.py
index 0e5bcd17b5..28bda67538 100644
--- a/flexmeasures/api/v3_0/tests/test_assets_api.py
+++ b/flexmeasures/api/v3_0/tests/test_assets_api.py
@@ -170,6 +170,34 @@ def test_get_assets(
         assert turbine["account_id"] == setup_accounts["Supplier"].id
 
 
+@pytest.mark.parametrize(
+    "requesting_user", ["test_admin_user@seita.nl"], indirect=True
+)
+def test_get_assets_filtered_by_asset_type(
+    client, setup_accounts, requesting_user
+):
+    supplier_account = setup_accounts["Supplier"]
+    supplier_account_id = supplier_account.id
+    supplier_assets = supplier_account.generic_assets
+
+    requested_type_id = supplier_assets[0].generic_asset_type_id
+    expected_assets = [
+        asset for asset in supplier_assets if asset.generic_asset_type_id == requested_type_id
+    ]
+
+    response = client.get(
+        url_for("AssetAPI:index"),
+        query_string={
+            "account_id": supplier_account_id,
+            "asset_type": requested_type_id,
+        },
+    )
+
+    assert response.status_code == 200
+    assert len(response.json) == len(expected_assets)
+    assert all(asset["generic_asset_type"]["id"] == requested_type_id for asset in response.json)
+
+
 @pytest.mark.parametrize(
     "requesting_user, sort_by, sort_dir, expected_name_of_first_sensor",
     [
diff --git a/flexmeasures/ui/templates/assets/asset_new.html b/flexmeasures/ui/templates/assets/asset_new.html
index 9a55309979..64e29c35bf 100644
--- a/flexmeasures/ui/templates/assets/asset_new.html
+++ b/flexmeasures/ui/templates/assets/asset_new.html
@@ -307,11 +307,12 @@ <h3>Location</h3>
 
         const params = new URLSearchParams({ page: page, per_page: perPage });
         if (filter) params.set("filter", filter);
-        if (assetTypeId) params.set("generic_asset_type_id", assetTypeId);
-        if (includePublic) params.set("include_public_assets", "true");
+        if (assetTypeId) params.set("asset_type", assetTypeId);
+        if (includePublic) params.set("include_public", "true");
         // Ensure stable ordering across pages to avoid page-overlap duplicates.
         params.set("sort_by", "id");
         params.set("sort_dir", "asc");
+        params.set("all_accessible", "true");
         return params;
     }
 

From 3336c0c835530d942ae66b337a7901a78a70d656 Mon Sep 17 00:00:00 2001
From: Joshua Edward <oghenerobojosh01@gmail.com>
Date: Mon, 25 May 2026 06:43:39 +0100
Subject: [PATCH 05/21] chore: add changelog entry

Signed-off-by: Joshua Edward <oghenerobojosh01@gmail.com>
---
 documentation/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/documentation/changelog.rst b/documentation/changelog.rst
index 9689b03588..e5132724da 100644
--- a/documentation/changelog.rst
+++ b/documentation/changelog.rst
@@ -27,6 +27,7 @@ New features
 * New ``GET /api/v3_0/sources`` endpoint to list accessible data sources and defined types, with ``only_latest=true`` by default to return only the most recent version per source [see `PR #2126 <https://www.github.com/FlexMeasures/flexmeasures/pull/2126>`_]
 * Add support for filtering sensor data GET requests by ``source-type`` on ``/api/v3_0/sensors/<id>/data`` [see `PR #2127 <https://www.github.com/FlexMeasures/flexmeasures/pull/2127>`_]
 * Making monitoring alerts more flexible: allow ``flexmeasures monitor`` alerts to target one or more user IDs or email addresses with ``--recipient``; ``flexmeasures monitor last-seen`` can now narrow monitored users to one or more accounts with ``--account`` or to client accounts with ``--consultancy`` [see `PR #2158 <https://www.github.com/FlexMeasures/flexmeasures/pull/2158>`_]
+* Support for creating new assets by using another asset as a template from the UI. [see `PR #2195 <https://www.github.com/FlexMeasures/flexmeasures/pull/2195>`_]
 
 Infrastructure / Support
 ----------------------

From a1c3380224729c2ebb123d664b26d3f37790f033 Mon Sep 17 00:00:00 2001
From: Joshua Edward <oghenerobojosh01@gmail.com>
Date: Mon, 25 May 2026 06:49:18 +0100
Subject: [PATCH 06/21] ref: make card title clickable

Signed-off-by: Joshua Edward <oghenerobojosh01@gmail.com>
---
 flexmeasures/ui/templates/assets/asset_new.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flexmeasures/ui/templates/assets/asset_new.html b/flexmeasures/ui/templates/assets/asset_new.html
index 64e29c35bf..08d7f2aa00 100644
--- a/flexmeasures/ui/templates/assets/asset_new.html
+++ b/flexmeasures/ui/templates/assets/asset_new.html
@@ -391,7 +391,7 @@ <h3>Location</h3>
             col.innerHTML =
                 '<div class="d-flex justify-content-between align-items-center border rounded px-2 py-1">' +
                 '<div class="me-2 text-truncate">' +
-                '<div class="fw-semibold text-truncate">' + escapeHtml(asset.name) + ' (ID:' + asset.id + ')</div>' +
+                '<div class="fw-semibold text-truncate" title="View Asset"> <a href="/assets/' + asset.id + '/properties" class="text-reset">' + escapeHtml(asset.name) + ' (ID:' + asset.id + ')</a></div>' +
                 '<div class="text-muted small text-truncate js-account-label">' + accountLabel + '</div>' +
                 '</div>' +
                 '<button class="btn btn-sm btn-primary js-copy-from-tab-btn"' +

From 28329b9db53d168d63a292b4c62e58f4c71376d7 Mon Sep 17 00:00:00 2001
From: Joshua Edward <oghenerobojosh01@gmail.com>
Date: Mon, 25 May 2026 07:22:04 +0100
Subject: [PATCH 07/21] feat: Set external_id to None in copy_asset to prevent
 unique constraint conflicts

Signed-off-by: Joshua Edward <oghenerobojosh01@gmail.com>
---
 flexmeasures/api/common/utils/api_utils.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/flexmeasures/api/common/utils/api_utils.py b/flexmeasures/api/common/utils/api_utils.py
index 9633ed0e2a..05e10d8720 100644
--- a/flexmeasures/api/common/utils/api_utils.py
+++ b/flexmeasures/api/common/utils/api_utils.py
@@ -640,6 +640,9 @@ def copy_asset(
                 "Invalid copy target parent: cannot copy an asset to itself or any of its descendants."
             )
 
+        # set external_id to None to avoid conflicts with unique constraint on (account_id, external_id)
+        asset.external_id = None
+
         copied_root, sensor_id_map = _copy_asset_subtree(
             source_asset=asset,
             destination_account_id=target_account_id,

From 4b472a40104ceb55ffaacae96309606b74f81784 Mon Sep 17 00:00:00 2001
From: Joshua Edward <oghenerobojosh01@gmail.com>
Date: Mon, 25 May 2026 07:30:38 +0100
Subject: [PATCH 08/21] chore: code linting

Signed-off-by: Joshua Edward <oghenerobojosh01@gmail.com>
---
 flexmeasures/api/v3_0/tests/test_assets_api.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/flexmeasures/api/v3_0/tests/test_assets_api.py b/flexmeasures/api/v3_0/tests/test_assets_api.py
index 28bda67538..89f1fe90f1 100644
--- a/flexmeasures/api/v3_0/tests/test_assets_api.py
+++ b/flexmeasures/api/v3_0/tests/test_assets_api.py
@@ -170,19 +170,17 @@ def test_get_assets(
         assert turbine["account_id"] == setup_accounts["Supplier"].id
 
 
-@pytest.mark.parametrize(
-    "requesting_user", ["test_admin_user@seita.nl"], indirect=True
-)
-def test_get_assets_filtered_by_asset_type(
-    client, setup_accounts, requesting_user
-):
+@pytest.mark.parametrize("requesting_user", ["test_admin_user@seita.nl"], indirect=True)
+def test_get_assets_filtered_by_asset_type(client, setup_accounts, requesting_user):
     supplier_account = setup_accounts["Supplier"]
     supplier_account_id = supplier_account.id
     supplier_assets = supplier_account.generic_assets
 
     requested_type_id = supplier_assets[0].generic_asset_type_id
     expected_assets = [
-        asset for asset in supplier_assets if asset.generic_asset_type_id == requested_type_id
+        asset
+        for asset in supplier_assets
+        if asset.generic_asset_type_id == requested_type_id
     ]
 
     response = client.get(
@@ -195,7 +193,10 @@ def test_get_assets_filtered_by_asset_type(
 
     assert response.status_code == 200
     assert len(response.json) == len(expected_assets)
-    assert all(asset["generic_asset_type"]["id"] == requested_type_id for asset in response.json)
+    assert all(
+        asset["generic_asset_type"]["id"] == requested_type_id
+        for asset in response.json
+    )
 
 
 @pytest.mark.parametrize(

From 339f8aeecb958eacbd22dd0a46f301e28c87c6bb Mon Sep 17 00:00:00 2001
From: Joshua Edward <oghenerobojosh01@gmail.com>
Date: Mon, 25 May 2026 09:57:15 +0100
Subject: [PATCH 09/21] feat: Remove unused parentAssetId variable and related
 logic from asset creation script

Signed-off-by: Joshua Edward <oghenerobojosh01@gmail.com>
---
 flexmeasures/ui/templates/assets/asset_new.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/flexmeasures/ui/templates/assets/asset_new.html b/flexmeasures/ui/templates/assets/asset_new.html
index 08d7f2aa00..e835982d3d 100644
--- a/flexmeasures/ui/templates/assets/asset_new.html
+++ b/flexmeasures/ui/templates/assets/asset_new.html
@@ -243,7 +243,6 @@ <h3>Location</h3>
 import { getAccount } from "{{ url_for('flexmeasures_ui.static', filename='js/ui-utils.js') }}?v={{ flexmeasures_version }}";
 
 (function () {
-    const parentAssetId = "{{ parent_asset_id }}";
     const perPage = 100;
     let currentPage = 1;
     let loadedAssetCount = 0;
@@ -413,7 +412,6 @@ <h3>Location</h3>
             btn.addEventListener("click", function () {
                 const assetId = btn.dataset.assetId;
                 let url = "/api/v3_0/assets/" + assetId + "/copy";
-                if (parentAssetId) url += "?parent_id=" + parentAssetId;
                 btn.disabled = true;
                 showToast("Creating asset from template…", "info");
                 fetch(url, { method: "POST", credentials: "same-origin" })

From 5f4838fee5ed04978e231668cb490c96589a1a2c Mon Sep 17 00:00:00 2001
From: Joshua Edward <oghenerobojosh01@gmail.com>
Date: Fri, 29 May 2026 08:12:45 +0100
Subject: [PATCH 10/21] feat: Update asset type handling and add
 AssetTypeIdField for better deserialization

Signed-off-by: Joshua Edward <oghenerobojosh01@gmail.com>
---
 flexmeasures/api/common/schemas/assets.py      |  5 ++---
 flexmeasures/api/v3_0/assets.py                |  4 ++--
 flexmeasures/api/v3_0/tests/test_assets_api.py |  4 +++-
 flexmeasures/data/schemas/generic_assets.py    | 18 ++++++++++++++++++
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/flexmeasures/api/common/schemas/assets.py b/flexmeasures/api/common/schemas/assets.py
index 9c0200b0a4..024adeb772 100644
--- a/flexmeasures/api/common/schemas/assets.py
+++ b/flexmeasures/api/common/schemas/assets.py
@@ -3,7 +3,7 @@
 from flexmeasures.api.common.schemas.generic_schemas import PaginationSchema
 from flexmeasures.api.common.schemas.users import AccountIdField
 from flexmeasures.data.schemas import AssetIdField
-from flexmeasures.data.schemas.generic_assets import GenericAssetSchema
+from flexmeasures.data.schemas.generic_assets import AssetTypeIdField, GenericAssetSchema
 
 
 default_response_fields = ["id", "name", "account_id", "generic_asset_type"]
@@ -92,10 +92,9 @@ class AssetAPIQuerySchema(PaginationSchema):
             example=False,
         ),
     )
-    asset_type = fields.Int(
+    asset_type = AssetTypeIdField(
         data_key="asset_type",
         required=False,
-        validate=validate.Range(min=1),
         metadata=dict(
             description="Filter assets by generic asset type ID.",
             example=2,
diff --git a/flexmeasures/api/v3_0/assets.py b/flexmeasures/api/v3_0/assets.py
index 88537fe3db..460b34b92b 100644
--- a/flexmeasures/api/v3_0/assets.py
+++ b/flexmeasures/api/v3_0/assets.py
@@ -267,7 +267,7 @@ def index(
         fields_in_response: list[str] | None,
         all_accessible: bool,
         include_public: bool,
-        asset_type: int | None = None,
+        asset_type: GenericAssetType | None = None,
         account: Account | None = None,
         root_asset: GenericAsset | None = None,
         max_depth: int | None = None,
@@ -367,7 +367,7 @@ def index(
             filter_statement = filter_statement | GenericAsset.account_id.is_(None)
         if asset_type is not None:
             filter_statement = filter_statement & (
-                GenericAsset.generic_asset_type_id == asset_type
+                GenericAsset.generic_asset_type_id == asset_type.id
             )
 
         query = query_assets_by_search_terms(
diff --git a/flexmeasures/api/v3_0/tests/test_assets_api.py b/flexmeasures/api/v3_0/tests/test_assets_api.py
index 89f1fe90f1..6c794d2f41 100644
--- a/flexmeasures/api/v3_0/tests/test_assets_api.py
+++ b/flexmeasures/api/v3_0/tests/test_assets_api.py
@@ -171,7 +171,9 @@ def test_get_assets(
 
 
 @pytest.mark.parametrize("requesting_user", ["test_admin_user@seita.nl"], indirect=True)
-def test_get_assets_filtered_by_asset_type(client, setup_accounts, requesting_user):
+def test_get_assets_filtered_by_asset_type(
+    client, setup_api_test_data, setup_accounts, requesting_user
+):
     supplier_account = setup_accounts["Supplier"]
     supplier_account_id = supplier_account.id
     supplier_assets = supplier_account.generic_assets
diff --git a/flexmeasures/data/schemas/generic_assets.py b/flexmeasures/data/schemas/generic_assets.py
index 73b96edc70..2d24c3d289 100644
--- a/flexmeasures/data/schemas/generic_assets.py
+++ b/flexmeasures/data/schemas/generic_assets.py
@@ -460,6 +460,24 @@ class Meta:
         model = GenericAssetType
 
 
+class AssetTypeIdField(MarshmallowClickMixin, fields.Int):
+    """Field that deserializes to a GenericAssetType and serializes back to an integer."""
+
+    def _deserialize(self, value: Any, attr, data, **kwargs) -> GenericAssetType:
+        """Turn a generic asset type id into a GenericAssetType."""
+        asset_type_id: int = super()._deserialize(value, attr, data, **kwargs)
+        asset_type = db.session.get(GenericAssetType, asset_type_id)
+        if asset_type is None:
+            raise FMValidationError(
+                f"No generic asset type found with id {asset_type_id}."
+            )
+        return asset_type
+
+    def _serialize(self, value: GenericAssetType, attr, obj, **kwargs):
+        """Turn a GenericAssetType into a generic asset type id."""
+        return value.id
+
+
 class GenericAssetIdField(MarshmallowClickMixin, fields.Int):
     """Field that deserializes to a GenericAsset and serializes back to an integer."""
 

From 6573504ce733a7398e5604f2a9beab406e27c7bd Mon Sep 17 00:00:00 2001
From: joshuaunity <oghenerobojosh01@gmail.com>
Date: Fri, 29 May 2026 08:21:21 +0100
Subject: [PATCH 11/21] chore: code formatting

Signed-off-by: joshuaunity <oghenerobojosh01@gmail.com>
---
 flexmeasures/api/common/schemas/assets.py |  5 ++++-
 flexmeasures/ui/static/openapi-specs.json | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/flexmeasures/api/common/schemas/assets.py b/flexmeasures/api/common/schemas/assets.py
index 024adeb772..5b6b1f0bdf 100644
--- a/flexmeasures/api/common/schemas/assets.py
+++ b/flexmeasures/api/common/schemas/assets.py
@@ -3,7 +3,10 @@
 from flexmeasures.api.common.schemas.generic_schemas import PaginationSchema
 from flexmeasures.api.common.schemas.users import AccountIdField
 from flexmeasures.data.schemas import AssetIdField
-from flexmeasures.data.schemas.generic_assets import AssetTypeIdField, GenericAssetSchema
+from flexmeasures.data.schemas.generic_assets import (
+    AssetTypeIdField,
+    GenericAssetSchema,
+)
 
 
 default_response_fields = ["id", "name", "account_id", "generic_asset_type"]
diff --git a/flexmeasures/ui/static/openapi-specs.json b/flexmeasures/ui/static/openapi-specs.json
index 757c1b02bb..d54e354afb 100644
--- a/flexmeasures/ui/static/openapi-specs.json
+++ b/flexmeasures/ui/static/openapi-specs.json
@@ -3456,7 +3456,7 @@
     "/api/v3_0/assets": {
       "get": {
         "summary": "List assets accessible by the user.",
-        "description": "This endpoint returns all assets that are accessible by the user after applying optional filters.\n\n  - The `account_id` query parameter can be used to list assets from any account (if the user is allowed to read them). Per default, the user's account is used.\n  - Alternatively, the `all_accessible` query parameter can be used to list assets from all accounts the current_user has read-access to, plus all public assets. Defaults to `false`.\n  - The `include_public` query parameter can be used to include public assets in the response. Defaults to `false`.\n  - The `root` query parameter can be used to list only descendants of a given root asset (including the root itself).\n  - The `depth` query parameter can be used to search only a max number of descendant generations from the root.\n\nThe endpoint supports pagination of the asset list using the `page` and `per_page` query parameters.\n  - If the `page` parameter is not provided, all assets are returned, without pagination information. The result will be a list of assets.\n  - If a `page` parameter is provided, the response will be paginated, showing a specific number of assets per page as defined by `per_page` (default is 10).\n  - If a search 'filter' such as 'solar \"ACME corp\"' is provided, the response will filter out assets where each search term is either present in their name or account name.\n  The response schema for pagination is inspired by [DataTables](https://datatables.net/manual/server-side#Returned-data)\n\nPer default, the response only includes a limited set of asset fields (id, name, account_id, generic_asset_type).\nYou can use the `fields` query parameter to specify a custom set of fields to include in the response.\n",
+        "description": "This endpoint returns all assets that are accessible by the user after applying optional filters.\n\n  - The `account_id` query parameter can be used to list assets from any account (if the user is allowed to read them). Per default, the user's account is used.\n  - Alternatively, the `all_accessible` query parameter can be used to list assets from all accounts the current_user has read-access to, plus all public assets. Defaults to `false`.\n  - The `include_public` query parameter can be used to include public assets in the response. Defaults to `false`.\n  - The `asset_type` query parameter can be used to filter by generic asset type ID.\n  - The `root` query parameter can be used to list only descendants of a given root asset (including the root itself).\n  - The `depth` query parameter can be used to search only a max number of descendant generations from the root.\n\nThe endpoint supports pagination of the asset list using the `page` and `per_page` query parameters.\n  - If the `page` parameter is not provided, all assets are returned, without pagination information. The result will be a list of assets.\n  - If a `page` parameter is provided, the response will be paginated, showing a specific number of assets per page as defined by `per_page` (default is 10).\n  - If a search 'filter' such as 'solar \"ACME corp\"' is provided, the response will filter out assets where each search term is either present in their name or account name.\n  The response schema for pagination is inspired by [DataTables](https://datatables.net/manual/server-side#Returned-data)\n\nPer default, the response only includes a limited set of asset fields (id, name, account_id, generic_asset_type).\nYou can use the `fields` query parameter to specify a custom set of fields to include in the response.\n",
         "security": [
           {
             "ApiKeyAuth": []
@@ -3581,6 +3581,16 @@
               "example": false
             },
             "required": false
+          },
+          {
+            "in": "query",
+            "name": "asset_type",
+            "description": "Filter assets by generic asset type ID.",
+            "schema": {
+              "type": "integer",
+              "example": 2
+            },
+            "required": false
           }
         ],
         "responses": {
@@ -4845,6 +4855,11 @@
             "default": false,
             "description": "Whether to include public assets. Ignored if an `account_id` is set. To fetch only public assets, use [/assets/public/](#/Assets/get_api_v3_0_assets_public) instead.",
             "example": false
+          },
+          "asset_type": {
+            "type": "integer",
+            "description": "Filter assets by generic asset type ID.",
+            "example": 2
           }
         },
         "additionalProperties": false

From e5749e38c663e0c0b451be83802fa68ef038ecee Mon Sep 17 00:00:00 2001
From: Joshua Edward <oghenerobojosh01@gmail.com>
Date: Mon, 1 Jun 2026 10:14:02 +0100
Subject: [PATCH 12/21] feat: Add parent asset ID handling for asset copy
 functionality

Signed-off-by: Joshua Edward <oghenerobojosh01@gmail.com>
---
 flexmeasures/ui/templates/assets/asset_new.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/flexmeasures/ui/templates/assets/asset_new.html b/flexmeasures/ui/templates/assets/asset_new.html
index e835982d3d..f0f1182212 100644
--- a/flexmeasures/ui/templates/assets/asset_new.html
+++ b/flexmeasures/ui/templates/assets/asset_new.html
@@ -244,6 +244,7 @@ <h3>Location</h3>
 
 (function () {
     const perPage = 100;
+    const parentAssetId = "{{ parent_asset_id }}";
     let currentPage = 1;
     let loadedAssetCount = 0;
     let hasMore = true;
@@ -412,6 +413,7 @@ <h3>Location</h3>
             btn.addEventListener("click", function () {
                 const assetId = btn.dataset.assetId;
                 let url = "/api/v3_0/assets/" + assetId + "/copy";
+                if (parentAssetId) url += "?parent_id=" + parentAssetId;
                 btn.disabled = true;
                 showToast("Creating asset from template…", "info");
                 fetch(url, { method: "POST", credentials: "same-origin" })

From 14b29028edac79adab856afd9d1f9230702c7ccb Mon Sep 17 00:00:00 2001
From: Joshua Edward <oghenerobojosh01@gmail.com>
Date: Mon, 1 Jun 2026 10:17:45 +0100
Subject: [PATCH 13/21] feat: Set external_id to None when copying assets to
 avoid unique constraint conflicts

Signed-off-by: Joshua Edward <oghenerobojosh01@gmail.com>
---
 flexmeasures/api/common/utils/api_utils.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/flexmeasures/api/common/utils/api_utils.py b/flexmeasures/api/common/utils/api_utils.py
index 387c41f8f0..6f8dc3d6fd 100644
--- a/flexmeasures/api/common/utils/api_utils.py
+++ b/flexmeasures/api/common/utils/api_utils.py
@@ -462,6 +462,8 @@ def _copy_asset_subtree(
         )
     asset_kwargs["account_id"] = destination_account_id
     asset_kwargs["parent_asset_id"] = destination_parent_asset_id
+    # set external_id to None to avoid conflicts with unique constraint on (account_id, external_id)
+    asset_kwargs["external_id"] = None
     asset_kwargs = convert_asset_json_fields(asset_kwargs)
 
     copied_asset = GenericAsset(**asset_kwargs)
@@ -601,9 +603,6 @@ def copy_asset(
                 "Invalid copy target parent: cannot copy an asset to itself or any of its descendants."
             )
 
-        # set external_id to None to avoid conflicts with unique constraint on (account_id, external_id)
-        asset.external_id = None
-
         copied_root, sensor_id_map = _copy_asset_subtree(
             source_asset=asset,
             destination_account_id=target_account_id,

From b407e223bc2572ce2470b5d2a8d4d4c19f61318e Mon Sep 17 00:00:00 2001
From: JDev <45713692+joshuaunity@users.noreply.github.com>
Date: Tue, 2 Jun 2026 16:09:57 +0100
Subject: [PATCH 14/21] Update flexmeasures/ui/templates/assets/asset_new.html
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Nicolas Höning <nicolas@seita.nl>
Signed-off-by: JDev <45713692+joshuaunity@users.noreply.github.com>
---
 flexmeasures/ui/templates/assets/asset_new.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flexmeasures/ui/templates/assets/asset_new.html b/flexmeasures/ui/templates/assets/asset_new.html
index f0f1182212..457cb118f3 100644
--- a/flexmeasures/ui/templates/assets/asset_new.html
+++ b/flexmeasures/ui/templates/assets/asset_new.html
@@ -391,7 +391,7 @@ <h3>Location</h3>
             col.innerHTML =
                 '<div class="d-flex justify-content-between align-items-center border rounded px-2 py-1">' +
                 '<div class="me-2 text-truncate">' +
-                '<div class="fw-semibold text-truncate" title="View Asset"> <a href="/assets/' + asset.id + '/properties" class="text-reset">' + escapeHtml(asset.name) + ' (ID:' + asset.id + ')</a></div>' +
+                '<div class="fw-semibold text-truncate" title="View Asset"> <a href="/assets/' + asset.id + '" class="text-reset">' + escapeHtml(asset.name) + ' (ID:' + asset.id + ')</a></div>' +
                 '<div class="text-muted small text-truncate js-account-label">' + accountLabel + '</div>' +
                 '</div>' +
                 '<button class="btn btn-sm btn-primary js-copy-from-tab-btn"' +

From 5ce10081f388d895462355eacb881ab70867cc18 Mon Sep 17 00:00:00 2001
From: joshuaunity <oghenerobojosh01@gmail.com>
Date: Tue, 2 Jun 2026 17:22:21 +0100
Subject: [PATCH 15/21] fix: fixed issue were public assets are always added

Signed-off-by: joshuaunity <oghenerobojosh01@gmail.com>
---
 flexmeasures/ui/templates/assets/asset_new.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/flexmeasures/ui/templates/assets/asset_new.html b/flexmeasures/ui/templates/assets/asset_new.html
index 457cb118f3..0ac9c18097 100644
--- a/flexmeasures/ui/templates/assets/asset_new.html
+++ b/flexmeasures/ui/templates/assets/asset_new.html
@@ -312,7 +312,6 @@ <h3>Location</h3>
         // Ensure stable ordering across pages to avoid page-overlap duplicates.
         params.set("sort_by", "id");
         params.set("sort_dir", "asc");
-        params.set("all_accessible", "true");
         return params;
     }
 

From 5f3bdc2bd1a0ccdb65c623e962646f5ff7e752bb Mon Sep 17 00:00:00 2001
From: joshuaunity <oghenerobojosh01@gmail.com>
Date: Tue, 2 Jun 2026 17:33:20 +0100
Subject: [PATCH 16/21] feat: enhance asset copy UI with pagination and
 improved loading state

Signed-off-by: joshuaunity <oghenerobojosh01@gmail.com>
---
 .../ui/templates/assets/asset_new.html        | 183 ++++++++++--------
 1 file changed, 107 insertions(+), 76 deletions(-)

diff --git a/flexmeasures/ui/templates/assets/asset_new.html b/flexmeasures/ui/templates/assets/asset_new.html
index 0ac9c18097..1dea95e26e 100644
--- a/flexmeasures/ui/templates/assets/asset_new.html
+++ b/flexmeasures/ui/templates/assets/asset_new.html
@@ -162,12 +162,10 @@ <h3>Location</h3>
 
             <div id="copyAssetsResults" class="row row-cols-1 row-cols-sm-2 row-cols-lg-4 g-1 my-2"></div>
             <div id="copyAssetsStatus" class="small text-muted my-1"></div>
-            <div id="copyAssetsBottomSpinner" class="justify-content-center my-2 d-none">
-                <div class="spinner-border spinner-border-sm text-primary" role="status">
-                    <span class="visually-hidden">Loading more…</span>
-                </div>
+            <div id="copyAssetsPagination" class="d-flex flex-wrap align-items-center gap-2 my-2 d-none">
+                <div id="copyAssetsPageNumbers" class="btn-group flex-wrap" role="group" aria-label="Asset search pages"></div>
+                <button id="copyAssetsNextBtn" type="button" class="btn btn-outline-primary btn-sm">Next</button>
             </div>
-            <div id="copyAssetsSentinel" class="w-100 py-2"></div>
 
         </div><!-- end #copy-asset tab pane -->
 
@@ -243,25 +241,23 @@ <h3>Location</h3>
 import { getAccount } from "{{ url_for('flexmeasures_ui.static', filename='js/ui-utils.js') }}?v={{ flexmeasures_version }}";
 
 (function () {
-    const perPage = 100;
-    const parentAssetId = "{{ parent_asset_id }}";
+    const perPage = 10;
+    let parentAssetId = "{{ parent_asset_id }}";
     let currentPage = 1;
-    let loadedAssetCount = 0;
-    let hasMore = true;
     let isLoading = false;
     let hasInitializedCopyTab = false;
     let searchDebounceTimer = null;
-    let totalFilteredRecords = null;
-    let observer = null;
+    let totalFilteredRecords = 0;
+    let totalPages = 0;
     let activeSearchToken = 0;
-    const renderedAssetIds = new Set();
     const accountNameCache = new Map();
 
     const spinner = document.getElementById("copyAssetsSpinner");
-    const bottomSpinner = document.getElementById("copyAssetsBottomSpinner");
     const results = document.getElementById("copyAssetsResults");
     const status = document.getElementById("copyAssetsStatus");
-    const sentinel = document.getElementById("copyAssetsSentinel");
+    const pagination = document.getElementById("copyAssetsPagination");
+    const pageNumbers = document.getElementById("copyAssetsPageNumbers");
+    const nextButton = document.getElementById("copyAssetsNextBtn");
 
     function toggleSpinner(show) {
         if (show) {
@@ -273,16 +269,6 @@ <h3>Location</h3>
         }
     }
 
-    function toggleBottomSpinner(show) {
-        if (show) {
-            bottomSpinner.classList.remove("d-none");
-            bottomSpinner.classList.add("d-flex");
-        } else {
-            bottomSpinner.classList.remove("d-flex");
-            bottomSpinner.classList.add("d-none");
-        }
-    }
-
     function setStatusMessage(message) {
         status.textContent = message || "";
     }
@@ -290,14 +276,13 @@ <h3>Location</h3>
     function resetSearchState() {
         activeSearchToken += 1;
         currentPage = 1;
-        loadedAssetCount = 0;
-        hasMore = true;
         isLoading = false;
-        totalFilteredRecords = null;
-        renderedAssetIds.clear();
+        totalFilteredRecords = 0;
+        totalPages = 0;
         results.innerHTML = "";
+        pageNumbers.innerHTML = "";
+        pagination.classList.add("d-none");
         setStatusMessage("");
-        toggleBottomSpinner(false);
     }
 
     function getSearchParams(page) {
@@ -319,17 +304,12 @@ <h3>Location</h3>
         if (reset) {
             resetSearchState();
         }
-        if (isLoading || !hasMore) {
+        if (isLoading) {
             return;
         }
 
         isLoading = true;
-        if (reset) {
-            toggleSpinner(true);
-            toggleBottomSpinner(false);
-        } else {
-            toggleBottomSpinner(true);
-        }
+        toggleSpinner(true);
         const requestToken = activeSearchToken;
         const params = getSearchParams(currentPage);
 
@@ -343,45 +323,36 @@ <h3>Location</h3>
                 return;
             }
             const assets = data.data || [];
-            totalFilteredRecords = data["filtered-records"];
+            totalFilteredRecords = data["filtered-records"] || 0;
+            totalPages = Math.ceil(totalFilteredRecords / perPage);
 
-            if (!assets.length && currentPage === 1) {
+            if (!assets.length) {
+                renderCopyResults([]);
+                renderPagination();
                 setStatusMessage("No assets found.");
-                hasMore = false;
                 return;
             }
 
             renderCopyResults(assets);
-            loadedAssetCount += assets.length;
-
-            if (
-                assets.length < perPage ||
-                (typeof totalFilteredRecords === "number" &&
-                    loadedAssetCount >= totalFilteredRecords)
-            ) {
-                hasMore = false;
-                setStatusMessage("Nothing more to load.");
-            } else {
-                currentPage += 1;
-                setStatusMessage("Scroll down to load more.");
-            }
+            renderPagination();
+            setStatusMessage(
+                "Showing page " + currentPage + " of " + totalPages +
+                " (" + totalFilteredRecords + " result" +
+                (totalFilteredRecords === 1 ? "" : "s") + ")."
+            );
         } catch (err) {
             showToast("Failed to search assets: " + err.message, "error");
             setStatusMessage("Failed to load assets.");
         } finally {
             isLoading = false;
             toggleSpinner(false);
-            toggleBottomSpinner(false);
         }
     }
 
     function renderCopyResults(assets) {
         const container = document.getElementById("copyAssetsResults");
+        container.innerHTML = "";
         assets.forEach(function (asset) {
-            if (renderedAssetIds.has(asset.id)) {
-                return;
-            }
-            renderedAssetIds.add(asset.id);
             const col = document.createElement("div");
             col.className = "col";
             const accountLabel = asset.account_id
@@ -412,7 +383,11 @@ <h3>Location</h3>
             btn.addEventListener("click", function () {
                 const assetId = btn.dataset.assetId;
                 let url = "/api/v3_0/assets/" + assetId + "/copy";
-                if (parentAssetId) url += "?parent_id=" + parentAssetId;
+                if (parentAssetId) {
+                    url += "?parent_id=" + parentAssetId;
+                } else {
+                    url += "?parent_id=" + assetId;
+                }
                 btn.disabled = true;
                 showToast("Creating asset from template…", "info");
                 fetch(url, { method: "POST", credentials: "same-origin" })
@@ -434,25 +409,75 @@ <h3>Location</h3>
         });
     }
 
-    function initInfiniteScroll() {
-        if (observer) {
-            observer.disconnect();
+    function renderPagination() {
+        pageNumbers.innerHTML = "";
+
+        if (!totalPages) {
+            pagination.classList.add("d-none");
+            return;
         }
-        observer = new IntersectionObserver(
-            function (entries) {
-                entries.forEach(function (entry) {
-                    if (entry.isIntersecting) {
-                        searchAssetsForCopy(false);
-                    }
-                });
-            },
-            {
-                root: null,
-                rootMargin: "200px 0px",
-                threshold: 0,
-            },
+
+        pagination.classList.remove("d-none");
+
+        const pageItems = getPageItems(totalPages, currentPage);
+        pageItems.forEach(function (item) {
+            if (item === "ellipsis") {
+                const ellipsis = document.createElement("span");
+                ellipsis.className = "px-2 align-self-center";
+                ellipsis.textContent = "...";
+                pageNumbers.appendChild(ellipsis);
+                return;
+            }
+
+            const page = item;
+            const pageButton = document.createElement("button");
+            pageButton.type = "button";
+            pageButton.className =
+                "btn btn-sm " +
+                (page === currentPage ? "btn-primary" : "btn-outline-primary");
+            pageButton.textContent = String(page);
+            pageButton.addEventListener("click", function () {
+                if (page === currentPage) {
+                    return;
+                }
+                currentPage = page;
+                searchAssetsForCopy(false);
+            });
+            pageNumbers.appendChild(pageButton);
+        });
+
+        nextButton.disabled = currentPage >= totalPages;
+    }
+
+    function getPageItems(total, current) {
+        if (total <= 7) {
+            return Array.from({ length: total }, (_, i) => i + 1);
+        }
+
+        const items = [];
+        const nearStart = current <= 4;
+        const nearEnd = current >= total - 3;
+
+        if (nearStart) {
+            items.push(1, 2, 3, 4, 5, "ellipsis", total);
+            return items;
+        }
+
+        if (nearEnd) {
+            items.push(1, "ellipsis", total - 4, total - 3, total - 2, total - 1, total);
+            return items;
+        }
+
+        items.push(
+            1,
+            "ellipsis",
+            current - 1,
+            current,
+            current + 1,
+            "ellipsis",
+            total,
         );
-        observer.observe(sentinel);
+        return items;
     }
 
     function triggerNewSearch() {
@@ -490,12 +515,18 @@ <h3>Location</h3>
     document.getElementById("copySearchInput").addEventListener("input", triggerNewSearch);
     document.getElementById("copyAssetTypeSelect").addEventListener("change", triggerNewSearch);
     document.getElementById("copyIncludePublic").addEventListener("change", triggerNewSearch);
+    nextButton.addEventListener("click", function () {
+        if (currentPage >= totalPages) {
+            return;
+        }
+        currentPage += 1;
+        searchAssetsForCopy(false);
+    });
 
     // Run initial search when the tab is first shown
     document.getElementById("copy-asset-tab").addEventListener("shown.bs.tab", function () {
         if (!hasInitializedCopyTab) {
             hasInitializedCopyTab = true;
-            initInfiniteScroll();
             searchAssetsForCopy(true);
         }
     });

From 8a94c302609befc49fe6dc31ac284db556e9f8aa Mon Sep 17 00:00:00 2001
From: joshuaunity <oghenerobojosh01@gmail.com>
Date: Fri, 12 Jun 2026 10:05:35 +0100
Subject: [PATCH 17/21] feat: update asset copy functionality to handle None
 values for account and parent asset IDs

Signed-off-by: joshuaunity <oghenerobojosh01@gmail.com>
---
 flexmeasures/api/common/utils/api_utils.py      | 14 ++++++++++----
 flexmeasures/api/v3_0/assets.py                 | 12 +++++++++++-
 flexmeasures/ui/templates/assets/asset_new.html |  9 ++++-----
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/flexmeasures/api/common/utils/api_utils.py b/flexmeasures/api/common/utils/api_utils.py
index 6f8dc3d6fd..2d7e43b48e 100644
--- a/flexmeasures/api/common/utils/api_utils.py
+++ b/flexmeasures/api/common/utils/api_utils.py
@@ -439,7 +439,7 @@ def _update_sensor_refs_in_subtree(
 
 def _copy_asset_subtree(
     source_asset: GenericAsset,
-    destination_account_id: int,
+    destination_account_id: int | None,
     destination_parent_asset_id: int | None,
     asset_schema: AssetSchema,
     add_copy_suffix: bool,
@@ -492,7 +492,7 @@ def _copy_asset_subtree(
 
 def _determine_copy_name(
     source_name: str,
-    destination_account_id: int,
+    destination_account_id: int | None,
     destination_parent_asset_id: int | None,
 ) -> str:
     """Return the next available copy name for the destination context.
@@ -583,13 +583,19 @@ def copy_asset(
         asset_schema = AssetSchema()
 
         if account is None and parent_asset is None:
-            target_account_id = int(asset.account_id)
+            target_account_id = (
+                int(asset.account_id) if asset.account_id is not None else None
+            )
             target_parent_asset_id = asset.parent_asset_id
         elif account is not None and parent_asset is None:
             target_account_id = int(account.id)
             target_parent_asset_id = None
         elif account is None and parent_asset is not None:
-            target_account_id = int(parent_asset.account_id)
+            target_account_id = (
+                int(parent_asset.account_id)
+                if parent_asset.account_id is not None
+                else None
+            )
             target_parent_asset_id = int(parent_asset.id)
         else:
             target_account_id = int(account.id)
diff --git a/flexmeasures/api/v3_0/assets.py b/flexmeasures/api/v3_0/assets.py
index 460b34b92b..416bdec9c7 100644
--- a/flexmeasures/api/v3_0/assets.py
+++ b/flexmeasures/api/v3_0/assets.py
@@ -1783,10 +1783,20 @@ def copy_assets(
         # permission is sufficient (any account member may add children to an asset).
         # When creating a top-level asset (no parent), we fall back to the account-level
         # create-children check, which requires account-admin or consultant.
+        # Special case: public-to-public copies (both None) require site admin.
         if resolved_parent is not None:
             check_access(resolved_parent, "create-children")
-        else:
+        elif resolved_account is not None:
             check_access(resolved_account, "create-children")
+        else:
+            # Public asset copy (account_id=None, parent_asset_id=None).
+            # Only site admins may create public assets.
+            if not running_as_cli() and not user_has_admin_access(
+                current_user, "update"
+            ):
+                raise Forbidden(
+                    "Only site admins may create public assets (account_id=None)."
+                )
 
         try:
             new_asset = copy_asset(asset, account=account, parent_asset=parent_asset)
diff --git a/flexmeasures/ui/templates/assets/asset_new.html b/flexmeasures/ui/templates/assets/asset_new.html
index 1dea95e26e..27b45d4c52 100644
--- a/flexmeasures/ui/templates/assets/asset_new.html
+++ b/flexmeasures/ui/templates/assets/asset_new.html
@@ -380,14 +380,13 @@ <h3>Location</h3>
 
             // Attach listener after button is added to DOM
             const btn = col.querySelector(".js-copy-from-tab-btn");
-            btn.addEventListener("click", function () {
+            btn.addEventListener("click", async function () {
                 const assetId = btn.dataset.assetId;
                 let url = "/api/v3_0/assets/" + assetId + "/copy";
                 if (parentAssetId) {
-                    url += "?parent_id=" + parentAssetId;
-                } else {
-                    url += "?parent_id=" + assetId;
+                    url += "?parent=" + parentAssetId;
                 }
+
                 btn.disabled = true;
                 showToast("Creating asset from template…", "info");
                 fetch(url, { method: "POST", credentials: "same-origin" })
@@ -398,7 +397,7 @@ <h3>Location</h3>
                     .then(function (data) {
                         showToast("Asset created successfully.", "success");
                         setTimeout(function () {
-                            window.location.href = "/assets/" + data.asset + "/properties";
+                           window.location.href = "/assets/" + data.asset + "/properties";
                         }, 2000);
                     })
                     .catch(function (err) {

From 26a042ff763cbb88a2095da86fcce2bea4d3662f Mon Sep 17 00:00:00 2001
From: joshuaunity <oghenerobojosh01@gmail.com>
Date: Fri, 12 Jun 2026 10:36:36 +0100
Subject: [PATCH 18/21] chore; set search input to search template keyword by
 default

Signed-off-by: joshuaunity <oghenerobojosh01@gmail.com>
---
 flexmeasures/ui/templates/assets/asset_new.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flexmeasures/ui/templates/assets/asset_new.html b/flexmeasures/ui/templates/assets/asset_new.html
index 27b45d4c52..dc1ebb7e50 100644
--- a/flexmeasures/ui/templates/assets/asset_new.html
+++ b/flexmeasures/ui/templates/assets/asset_new.html
@@ -136,7 +136,7 @@ <h3>Location</h3>
             <div class="row mb-3 mt-3">
                 <div class="col-md-5">
                     <input type="text" id="copySearchInput" class="form-control"
-                        placeholder="Search assets…">
+                        placeholder="Search assets…" value="Template">
                 </div>
                 <div class="col-md-3">
                     <select id="copyAssetTypeSelect" class="form-select">

From 75f242ffedf2312979e10d3940d7f68fd7b5346e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20H=C3=B6ning?= <nicolas@seita.nl>
Date: Wed, 1 Jul 2026 14:20:26 +0200
Subject: [PATCH 19/21] use all_accessible param to look up assets, show 15 per
 page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nicolas Höning <nicolas@seita.nl>
---
 flexmeasures/ui/templates/assets/asset_new.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/flexmeasures/ui/templates/assets/asset_new.html b/flexmeasures/ui/templates/assets/asset_new.html
index dc1ebb7e50..0773733a3c 100644
--- a/flexmeasures/ui/templates/assets/asset_new.html
+++ b/flexmeasures/ui/templates/assets/asset_new.html
@@ -147,10 +147,14 @@ <h3>Location</h3>
                     </select>
                 </div>
                 <div class="col-md-4 d-flex align-items-center">
+                {% if not current_user.has_role('admin') %}
                     <div class="form-check">
                         <input class="form-check-input" type="checkbox" id="copyIncludePublic" checked>
                         <label class="form-check-label" for="copyIncludePublic">Include public assets</label>
                     </div>
+                {% else %}
+                    <input style="display: none;" class="form-check-input" type="checkbox" id="copyIncludePublic" checked>
+                {% endif %}
                 </div>
             </div>
 
@@ -241,7 +245,7 @@ <h3>Location</h3>
 import { getAccount } from "{{ url_for('flexmeasures_ui.static', filename='js/ui-utils.js') }}?v={{ flexmeasures_version }}";
 
 (function () {
-    const perPage = 10;
+    const perPage = 15;
     let parentAssetId = "{{ parent_asset_id }}";
     let currentPage = 1;
     let isLoading = false;
@@ -291,6 +295,7 @@ <h3>Location</h3>
         const includePublic = document.getElementById("copyIncludePublic").checked;
 
         const params = new URLSearchParams({ page: page, per_page: perPage });
+        params.set("all_accessible", true);
         if (filter) params.set("filter", filter);
         if (assetTypeId) params.set("asset_type", assetTypeId);
         if (includePublic) params.set("include_public", "true");

From 80b993f27f5433d4b1bc96bc0b88b9413e55f99d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20H=C3=B6ning?= <nicolas@seita.nl>
Date: Wed, 1 Jul 2026 14:54:26 +0200
Subject: [PATCH 20/21] add a doc section on how to create a child asset
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nicolas Höning <nicolas@seita.nl>
---
 documentation/views/asset-data.rst        | 73 +++++++++++++++--------
 flexmeasures/ui/static/openapi-specs.json |  2 +-
 2 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/documentation/views/asset-data.rst b/documentation/views/asset-data.rst
index b352f30307..6ccf0f55ae 100644
--- a/documentation/views/asset-data.rst
+++ b/documentation/views/asset-data.rst
@@ -56,37 +56,27 @@ Per asset, you can set fields in :ref:`the flex-context <flex_context>`, which w
 
 |
 
-Editing an asset's flex-model
+
+Creating a new child asset
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Per asset, you can set fields in :ref:`the flex-model <flex_model>`. The flex model dialogue allows you to define a set or a single value type based on what the field allows, these include fixed values, sensors, floats, list (sensors or fixed values) and booleans. Initially, no fields are set.
+From the context page, you can create a new child asset (you can also get there from the properties page, actually).
+There are to ways to do that.
 
-.. image:: https://github.com/FlexMeasures/screenshots/raw/main/screenshot_asset_flexmodel.png
+A simple asset form, including a map selector:
+
+.. image:: https://github.com/FlexMeasures/screenshots/raw/main/screenshot_asset_new.png
     :align: center
 ..    :scale: 40%
 
 |
 
-Flex context overview
-"""""""""""""""""""""""
-
-* **Left Panel:** Displays a list of currently configured fields.
-* **Right Panel:** Shows details of the selected field and provides a form to modify its value.
-
-Adding a field
-"""""""""""""""
-1.  **Select Field:** Choose the desired field from the dropdown menu in the top right corner of the modal.
-2.  **Add Field:** Click the "Add Field" button next to the dropdown.
-3.  The field will be added to the list in the left panel.
-
-Setting a field value
-"""""""""""""""""""""
-
-1.  **Select Field (if it is not selected yet):** Click on the field in the left panel.
-2.  **Save Value:** In the right panel, use the provided form to set the field's value.
+You can also copy an exisiting asset, including its child assets, sensors and flex-config.
+You can search for the asset you want to copy:
 
-    * Some fields may only accept a sensor value.
-    * Other fields may accept either a sensor or a fixed value.
+.. image:: https://github.com/FlexMeasures/screenshots/raw/main/screenshot_asset_copy.png
+    :align: center
+..    :scale: 40%
 
 |
 
@@ -161,9 +151,9 @@ An example would be:
 Properties page
 ---------------
 
-The properties page allows you to view and edit the properties of the asset.
-It lists stored secret names without exposing their values and shows a
-human-readable expiration time when one is available.
+The properties page allows you to view and edit the properties of the asset,
+including attributes, sensors and child assets.
+Also, it lists stored secret names and expiration times without exposing their values.
 
 You can also delete the asset by clicking on the "Delete this asset" button.
 
@@ -173,6 +163,39 @@ You can also delete the asset by clicking on the "Delete this asset" button.
 
 |
 
+Editing an asset's flex-model
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Per asset, you can set fields in :ref:`the flex-model <flex_model>`. The flex model dialogue allows you to define a set or a single value type based on what the field allows, these include fixed values, sensors, floats, list (sensors or fixed values) and booleans. Initially, no fields are set.
+
+.. image:: https://github.com/FlexMeasures/screenshots/raw/main/screenshot_asset_flexmodel.png
+    :align: center
+..    :scale: 40%
+
+|
+
+Flex context overview
+"""""""""""""""""""""""
+
+* **Left Panel:** Displays a list of currently configured fields.
+* **Right Panel:** Shows details of the selected field and provides a form to modify its value.
+
+Adding a field
+"""""""""""""""
+1.  **Select Field:** Choose the desired field from the dropdown menu in the top right corner of the modal.
+2.  **Add Field:** Click the "Add Field" button next to the dropdown.
+3.  The field will be added to the list in the left panel.
+
+Setting a field value
+"""""""""""""""""""""
+
+1.  **Select Field (if it is not selected yet):** Click on the field in the left panel.
+2.  **Save Value:** In the right panel, use the provided form to set the field's value.
+
+    * Some fields may only accept a sensor value.
+    * Other fields may accept either a sensor or a fixed value.
+
+|
 .. _view_asset_status:
 
 Status page
diff --git a/flexmeasures/ui/static/openapi-specs.json b/flexmeasures/ui/static/openapi-specs.json
index 91301ba4a1..67ceae5c14 100644
--- a/flexmeasures/ui/static/openapi-specs.json
+++ b/flexmeasures/ui/static/openapi-specs.json
@@ -3477,7 +3477,7 @@
     "/api/v3_0/assets": {
       "get": {
         "summary": "List assets accessible by the user.",
-        "description": "This endpoint returns all assets that are accessible by the user after applying optional filters.\n\n  - The `account_id` query parameter can be used to list assets from any account (if the user is allowed to read them). Per default, the user's account is used.\n  - Alternatively, the `all_accessible` query parameter can be used to list assets from all accounts the current_user has read-access to, plus all public assets. Defaults to `false`.\n  - The `include_public` query parameter can be used to include public assets in the response. Defaults to `false`.\n  - The `asset_type` query parameter can be used to filter by generic asset type ID.\n  - The `root` query parameter can be used to list only descendants of a given root asset (including the root itself).\n  - The `depth` query parameter can be used to search only a max number of descendant generations from the root.\n\nThe endpoint supports pagination of the asset list using the `page` and `per_page` query parameters.\n  - If the `page` parameter is not provided, all assets are returned, without pagination information. The result will be a list of assets.\n  - If a `page` parameter is provided, the response will be paginated, showing a specific number of assets per page as defined by `per_page` (default is 10).\n  - If a search 'filter' such as 'solar \"ACME corp\"' is provided, the response will filter out assets where each search term is either present in their name or account name.\n  The response schema for pagination is inspired by [DataTables](https://datatables.net/manual/server-side#Returned-data)\n\nPer default, the response only includes a limited set of asset fields (id, name, account_id, generic_asset_type).\nYou can use the `fields` query parameter to specify a custom set of fields to include in the response.\n",
+        "description": "This endpoint returns all assets that are accessible by the user after applying optional filters.\n\n  - The `account_id` query parameter can be used to list assets from any account (if the user is allowed to read them). Per default, the user's account is used.\n  - Alternatively, the `all_accessible` query parameter can be used to list assets from all accounts the current_user has read-access to, plus all public assets. Defaults to `false`.\n  - The `include_public` query parameter can be used to include public assets in the response. Defaults to `false`.\n  - The `asset_type` query parameter can be used to filter by generic asset type ID.\n  - The `root` query parameter can be used to list only descendants of a given root asset (including the root itself).\n  - The `depth` query parameter can be used to search only a max number of descendant generations from the root.\n\nThe endpoint supports pagination of the asset list using the `page` and `per_page` query parameters.\n  - If the `page` parameter is not provided, all assets are returned, without pagination information. The result will be a list of assets.\n  - If a `page` parameter is provided, the response will be paginated, showing a specific number of assets per page as defined by `per_page` (default is 10).\n  - If a search 'filter' such as 'solar \"ACME corp\"' is provided, the response will return only assets where each search term is either present in their name or account name, or is a prefix of their ID.\n  The response schema for pagination is inspired by [DataTables](https://datatables.net/manual/server-side#Returned-data)\n\nPer default, the response only includes a limited set of asset fields (id, name, account_id, generic_asset_type).\nYou can use the `fields` query parameter to specify a custom set of fields to include in the response.\n",
         "security": [
           {
             "ApiKeyAuth": []

From 25c75a1f46c9babb18547d6d15b72858fbd018fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20H=C3=B6ning?= <nicolas@seita.nl>
Date: Wed, 1 Jul 2026 19:25:32 +0200
Subject: [PATCH 21/21] no pre-fill of search term, let's do that in the next
 PR
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nicolas Höning <nicolas@seita.nl>
---
 flexmeasures/ui/templates/assets/asset_new.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flexmeasures/ui/templates/assets/asset_new.html b/flexmeasures/ui/templates/assets/asset_new.html
index 0773733a3c..74c63beb68 100644
--- a/flexmeasures/ui/templates/assets/asset_new.html
+++ b/flexmeasures/ui/templates/assets/asset_new.html
@@ -136,7 +136,7 @@ <h3>Location</h3>
             <div class="row mb-3 mt-3">
                 <div class="col-md-5">
                     <input type="text" id="copySearchInput" class="form-control"
-                        placeholder="Search assets…" value="Template">
+                        placeholder="Search assets…" value="">
                 </div>
                 <div class="col-md-3">
                     <select id="copyAssetTypeSelect" class="form-select">