From fbe276ee0754cbfd3755901ddc41c4bd6b8df093 Mon Sep 17 00:00:00 2001
From: Nikol Georgieva <nicole.georgieva18@abv.bg>
Date: Wed, 16 Sep 2026 00:06:06 +0300
Subject: [PATCH 1/5] ui: a document's footer offers a clear Finish, and
 workflow tasks leave the editor footer for the Inbox (#7403)

On a generated document (header-items) entity the editing footer confused a
non-developer: line items persist the moment they are added (each row is its own
POST/PUT), so the header form is clean and the Save guard `isEdit && !isDirty()`
greys Save out - correct, but it reads as "stuck". The footer also mixed workflow
(Approve/Issue user-tasks), utilities (Print/Duplicate/...) and the editing
session, with two primary buttons (a BPM task and Save) competing for "which one
finishes this?".

Separate authoring the document from advancing its lifecycle:

- Remove the BPM user-task buttons from the record-editor footers (power document
  and plain form). They are only an inline mirror of the Process Inbox - the same
  tasks come from /services/inbox/tasks and feed the notification bell - so the
  Inbox and the bell keep them; nothing is lost. The master-detail read view keeps
  its inline task surfacing (that is not an editor footer).
- Document entities get one honest primary: Create (persist the header, then STAY
  so line items can be added) on create, and Finish (save any header change, then
  return to the list) once saved. Finish only navigates on a successful save - a
  failed validation keeps the user on the page with the error. Never a greyed Save.
- Discard/Cancel is shown only while the header has unsaved edits; a clean saved
  document yields to Finish. Preview (immutable) footer unchanged.
- Applied to the power, my and partner document views + pages, and the plain form
  footer; `finish` added to the shared defaults catalog.

Deliberately reverses two earlier choices for these editors: #7359 (Save stayed on
the document - Finish navigates away after saving, but the unsaved-changes guard
still applies) and #6074 (inline task surfacing - workflow moves to the Inbox).

Verified: ModelGenerationIT green (every template renders twice, descriptor +
cross-project entity extension asserted); reactor quick-build SUCCESS;
formatter:validate SUCCESS on the changed module.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../ui/my/my-document-page.js.template        | 11 +++++++
 .../ui/my/my-document-view.html.template      | 16 +++++++---
 .../partner/partner-document-page.js.template | 11 +++++++
 .../partner-document-view.html.template       | 16 +++++++---
 .../document/document-page.js.template        | 14 ++++++++
 .../document/document-view.html.template      | 32 +++++++++++--------
 .../manage/form-view.html.template            | 15 +++------
 .../ui/translations.json.template             |  1 +
 8 files changed, 84 insertions(+), 32 deletions(-)

diff --git a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-page.js.template b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-page.js.template
index cca3a69534c..b7b74281269 100644
--- a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-page.js.template
+++ b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-page.js.template
@@ -638,6 +638,17 @@ document.addEventListener('alpine:init', () => {
     // A document with unsaved header edits asks before it is abandoned (issue #7359); a clean one
     // leaves silently, as before.
     goBack() { this.guardExit(() => this.navigate('/my/${name}')); },
+
+    // "Finish" on a saved document (issue #7403). Line items persist as they are added, so the only
+    // thing still unsaved is a header edit: save it, and only leave if the save succeeded (a failure
+    // sets this.error and keeps the user on the page). A clean header just returns to the list.
+    async finish() {
+      if (this.isDirty()) {
+        await this.save();
+        if (this.error) return;
+      }
+      this.goBack();
+    },
 #set($docChildren = [])
 #if($myChildren)
 #foreach($child in $myChildren)
diff --git a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-view.html.template b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-view.html.template
index faddadd42b0..b2e796583fd 100644
--- a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-view.html.template
+++ b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-view.html.template
@@ -366,12 +366,20 @@
       <button x-h-button data-variant="negative" x-show="mode === 'edit'#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="deleteOpen = true"
               x-text="T('$projectName:${tprefix}.defaults.delete', 'Delete')"></button>
       <div class="flex-1"></div>
-      <!-- The button says what it will do: leaving a dirty form discards the edit (issue #7359). -->
-      <button x-h-button data-variant="transparent" @click="goBack()" :disabled="saving"
+      <!-- Cancel a new document, or discard unsaved header edits (issue #7359). Once a saved document
+           is clean there is nothing to discard, so this yields to Finish. -->
+      <button x-h-button data-variant="transparent" x-show="mode !== 'edit' || isDirty()" @click="goBack()" :disabled="saving"
               x-text="isDirty() ? T('$projectName:${tprefix}.defaults.discard', 'Discard') : T('$projectName:${tprefix}.defaults.cancel', 'Cancel')"></button>
-      <button x-h-button data-variant="primary"#if($immutableStatusProperty || $immutableAlways || $periodLock) x-show="mutable"#end @click="save()" :disabled="saving || (mode === 'edit' &amp;&amp; !isDirty())">
+      <!-- Create a new header, then stay to add line items. -->
+      <button x-h-button data-variant="primary" x-show="mode !== 'edit'#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="save()" :disabled="saving">
         <span x-show="saving" x-h-spinner></span>
-        <span x-text="T('$projectName:${tprefix}.defaults.save', 'Save')"></span>
+        <span x-text="T('$projectName:${tprefix}.defaults.create', 'Create')"></span>
+      </button>
+      <!-- Finish: line items save as you add them, so this saves any header change and returns to the
+           list - one honest primary action, never a greyed Save (issue #7403). -->
+      <button x-h-button data-variant="primary" x-show="mode === 'edit'#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="finish()" :disabled="saving">
+        <span x-show="saving" x-h-spinner></span>
+        <span x-text="T('$projectName:${tprefix}.defaults.finish', 'Finish')"></span>
       </button>
 #end
     </div>
diff --git a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-page.js.template b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-page.js.template
index cb80256292d..06b9ea07a98 100644
--- a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-page.js.template
+++ b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-page.js.template
@@ -524,5 +524,16 @@ document.addEventListener('alpine:init', () => {
     // A document with unsaved header edits asks before it is abandoned (issue #7359); a clean one
     // leaves silently, as before.
     goBack() { this.guardExit(() => this.navigate('/partner/${name}')); },
+
+    // "Finish" on a saved document (issue #7403). Line items persist as they are added, so the only
+    // thing still unsaved is a header edit: save it, and only leave if the save succeeded (a failure
+    // sets this.error and keeps the user on the page). A clean header just returns to the list.
+    async finish() {
+      if (this.isDirty()) {
+        await this.save();
+        if (this.error) return;
+      }
+      this.goBack();
+    },
   }));
 });
diff --git a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-view.html.template b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-view.html.template
index 09918455284..6a30b7f0d46 100644
--- a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-view.html.template
+++ b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-view.html.template
@@ -220,12 +220,20 @@
       <button x-h-button data-variant="negative" x-show="mode === 'edit'#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="deleteOpen = true"
               x-text="T('$projectName:${tprefix}.defaults.delete', 'Delete')"></button>
       <div class="flex-1"></div>
-      <!-- The button says what it will do: leaving a dirty form discards the edit (issue #7359). -->
-      <button x-h-button data-variant="transparent" @click="goBack()" :disabled="saving"
+      <!-- Cancel a new document, or discard unsaved header edits (issue #7359). Once a saved document
+           is clean there is nothing to discard, so this yields to Finish. -->
+      <button x-h-button data-variant="transparent" x-show="mode !== 'edit' || isDirty()" @click="goBack()" :disabled="saving"
               x-text="isDirty() ? T('$projectName:${tprefix}.defaults.discard', 'Discard') : T('$projectName:${tprefix}.defaults.cancel', 'Cancel')"></button>
-      <button x-h-button data-variant="primary"#if($immutableStatusProperty || $immutableAlways || $periodLock) x-show="mutable"#end @click="save()" :disabled="saving || (mode === 'edit' &amp;&amp; !isDirty())">
+      <!-- Create a new header, then stay to add line items. -->
+      <button x-h-button data-variant="primary" x-show="mode !== 'edit'#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="save()" :disabled="saving">
         <span x-show="saving" x-h-spinner></span>
-        <span x-text="T('$projectName:${tprefix}.defaults.save', 'Save')"></span>
+        <span x-text="T('$projectName:${tprefix}.defaults.create', 'Create')"></span>
+      </button>
+      <!-- Finish: line items save as you add them, so this saves any header change and returns to the
+           list - one honest primary action, never a greyed Save (issue #7403). -->
+      <button x-h-button data-variant="primary" x-show="mode === 'edit'#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="finish()" :disabled="saving">
+        <span x-show="saving" x-h-spinner></span>
+        <span x-text="T('$projectName:${tprefix}.defaults.finish', 'Finish')"></span>
       </button>
     </div>
   </div>
diff --git a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-page.js.template b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-page.js.template
index c9cc9395c6d..07ff7304233 100644
--- a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-page.js.template
+++ b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-page.js.template
@@ -1406,6 +1406,20 @@ document.addEventListener('alpine:init', () => {
     // being asked about (issue #7359). A clean one leaves silently, as before.
     backToList() { this.guardExit(() => window.PineconeRouter.navigate('/${name}')); },
 
+    // "Finish" on a saved document (issue #7403). Line items persist as they are added, so the only
+    // thing that can still be unsaved is a header edit: save it first, and only leave if the save
+    // succeeded - a failed validation keeps the user on the page with the error, never navigating on
+    // failure. A clean header just returns to the list. Not offered on create (that is the Create
+    // button, which stays on the document so line items can be added).
+    async finish() {
+      if (this.isPreview) return;
+      if (this.isDirty()) {
+        await this.save();
+        if (this.state !== 'ready') return;
+      }
+      window.PineconeRouter.navigate('/${name}');
+    },
+
     // Preview -> the editable document for the same record.
     goEdit() { window.PineconeRouter.navigate('/${name}/' + encodeURIComponent(this.id) + '/edit'); },
   }));
diff --git a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-view.html.template b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-view.html.template
index ce1123dd0fc..c2d79f90778 100644
--- a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-view.html.template
+++ b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-view.html.template
@@ -529,16 +529,13 @@
       </div>
     </template>
 
-    <!-- ===== Document footer: BPM user-task buttons on the LEFT; Cancel + Save/Create on the RIGHT ===== -->
+    <!-- ===== Document footer: utilities + Cancel/Discard on the LEFT; Create/Finish on the RIGHT
+         (workflow user-tasks live in the Process Inbox, not here - issue #7403) ===== -->
     <div x-h-toolbar.footer>
-#if($hasProcess)
-      <!-- Actionable BPM user-task buttons (edit only, hidden in read-only preview), left-aligned. -->
-      <template x-for="task in $store.processTasks.getTasks(form)" :key="task.id">
-        <button type="button" x-h-button data-variant="primary" x-show="!isPreview" @click="$store.processTasks.openTask(task)">
-          <svg role="presentation" x-h-lucide data-lucide="inbox"></svg><span x-text="$store.processTasks.taskName(task)"></span>
-        </button>
-      </template>
-#end
+      <!-- Workflow user-tasks (Approve, Issue, ...) are NOT offered here: the editor footer is for
+           authoring the document, not advancing its lifecycle. The same tasks live in the Process
+           Inbox and the notification bell (both read /services/inbox/tasks), so nothing is lost by
+           keeping them out of the editing surface (issue #7403). -->
       <div x-h-toolbar-spacer></div>
       <span class="text-sm text-secondary-foreground" x-show="printError" x-text="printError"></span>
       <!-- Print: renders the CMS template (Templates/${name}/Print/<lang>/) to PDF; asks for the
@@ -568,12 +565,19 @@
       <button type="button" x-h-button data-variant="primary" x-show="isPreview#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="goEdit()">
         <svg role="presentation" x-h-lucide data-lucide="pencil"></svg><span x-text="T('$projectName:${tprefix}.defaults.edit', 'Edit')"></span>
       </button>
-      <!-- The button says what it will do: leaving a dirty form discards the edit (issue #7359). -->
-      <button type="button" x-h-button data-variant="transparent" x-show="!isPreview" @click="backToList()" :disabled="state === 'saving'" x-text="isDirty() ? T('$projectName:${tprefix}.defaults.discard', 'Discard') : T('$projectName:${tprefix}.defaults.cancel', 'Cancel')"></button>
-      <!-- Nothing to save on an unchanged document; a create is always offerable. -->
-      <button type="button" x-h-button data-variant="primary" x-show="!isPreview" :disabled="state === 'saving' || (isEdit &amp;&amp; !isDirty())" @click="save()">
+      <!-- Cancel a new document, or discard unsaved header edits (issue #7359). Once a saved document
+           is clean there is nothing to discard, so this yields to Finish below. -->
+      <button type="button" x-h-button data-variant="transparent" x-show="!isPreview &amp;&amp; (!isEdit || isDirty())" @click="backToList()" :disabled="state === 'saving'" x-text="isDirty() ? T('$projectName:${tprefix}.defaults.discard', 'Discard') : T('$projectName:${tprefix}.defaults.cancel', 'Cancel')"></button>
+      <!-- Create a new header, then STAY on the document (edit mode) so line items can be added. -->
+      <button type="button" x-h-button data-variant="primary" x-show="!isPreview &amp;&amp; !isEdit" :disabled="state === 'saving'" @click="save()">
+        <span x-show="state === 'saving'" x-h-spinner></span>
+        <svg x-h-lucide role="presentation" data-lucide="save" x-show="state !== 'saving'"></svg><span x-text="T('$projectName:${tprefix}.defaults.create', 'Create')"></span>
+      </button>
+      <!-- Finish: line items are already saved as you add them, so this saves any header change and
+           returns to the list - one honest primary action, never a greyed Save (issue #7403). -->
+      <button type="button" x-h-button data-variant="primary" x-show="!isPreview &amp;&amp; isEdit" :disabled="state === 'saving'" @click="finish()">
         <span x-show="state === 'saving'" x-h-spinner></span>
-        <svg x-h-lucide role="presentation" data-lucide="save" x-show="state !== 'saving'"></svg><span x-text="isEdit ? T('$projectName:${tprefix}.defaults.update', 'Save') : T('$projectName:${tprefix}.defaults.create', 'Create')"></span>
+        <svg x-h-lucide role="presentation" data-lucide="check" x-show="state !== 'saving'"></svg><span x-text="T('$projectName:${tprefix}.defaults.finish', 'Finish')"></span>
       </button>
     </div>
     </div>
diff --git a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/manage/form-view.html.template b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/manage/form-view.html.template
index a0d607447ee..dcfb558bb39 100644
--- a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/manage/form-view.html.template
+++ b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/manage/form-view.html.template
@@ -457,17 +457,12 @@
     </div>
 
     <!-- Action footer at the very bottom of the main column (below the detail panels), matching the
-         document view. BPM user-task buttons on the LEFT; Cancel + Save/Create on the RIGHT. Save is
-         type=button @click=save() because it lives outside the header <form>. -->
+         document view. Cancel + Save/Create on the RIGHT; workflow user-tasks live in the Process
+         Inbox, not here (issue #7403). Save is type=button @click=save() because it lives outside the
+         header <form>. -->
     <div x-h-toolbar.footer>
-#if($hasProcess)
-      <!-- Actionable BPM user-task buttons (edit only, hidden in read-only preview), left-aligned. -->
-      <template x-for="task in $store.processTasks.getTasks(form)" :key="task.id">
-        <button type="button" x-h-button data-variant="primary" x-show="!isPreview" @click="$store.processTasks.openTask(task)">
-          <svg role="presentation" x-h-lucide data-lucide="inbox"></svg><span x-text="$store.processTasks.taskName(task)"></span>
-        </button>
-      </template>
-#end
+      <!-- Workflow user-tasks are NOT offered in the editor footer: the same tasks live in the Process
+           Inbox and the notification bell, so the footer is for editing the record only (issue #7403). -->
       <div x-h-toolbar-spacer></div>
 #if($hasPrint == "true")
       <!-- Print: for a document master rendered through this shared form (a calendar/slots view that
diff --git a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/translations.json.template b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/translations.json.template
index 3c982fb9891..9cf5498eb4e 100644
--- a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/translations.json.template
+++ b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/translations.json.template
@@ -94,6 +94,7 @@
         "open": "Open",
         "readOnly": "Read-only",
         "update": "Update",
+        "finish": "Finish",
         "delete": "Delete",
         "cancel": "Cancel",
         "discard": "Discard",

From f416954dda5aecb4b93c5789dfdf98814de8409f Mon Sep 17 00:00:00 2001
From: Nikol Georgieva <nicole.georgieva18@abv.bg>
Date: Wed, 16 Sep 2026 00:24:00 +0300
Subject: [PATCH 2/5] ui: keep the document footer's Cancel/Discard exit always
 visible (#7403)

The first cut hid the Cancel/Discard button once a saved document was clean, on the
reasoning that Finish already returns to the list. But that left no explicit exit in
the common state (after adding line items) and made Finish conflate "leave" with
"done". Restore the always-visible escape hatch that every other view has: Cancel a
clean document, Discard unsaved header edits (the label flips on isDirty()), shown
next to Create/Finish. Power, my and partner document views.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../ui/my/my-document-view.html.template                    | 6 +++---
 .../ui/partner/partner-document-view.html.template          | 6 +++---
 .../ui/perspective/document/document-view.html.template     | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-view.html.template b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-view.html.template
index b2e796583fd..14cc59a0339 100644
--- a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-view.html.template
+++ b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-view.html.template
@@ -366,9 +366,9 @@
       <button x-h-button data-variant="negative" x-show="mode === 'edit'#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="deleteOpen = true"
               x-text="T('$projectName:${tprefix}.defaults.delete', 'Delete')"></button>
       <div class="flex-1"></div>
-      <!-- Cancel a new document, or discard unsaved header edits (issue #7359). Once a saved document
-           is clean there is nothing to discard, so this yields to Finish. -->
-      <button x-h-button data-variant="transparent" x-show="mode !== 'edit' || isDirty()" @click="goBack()" :disabled="saving"
+      <!-- Always an escape hatch, kept visible next to Create/Finish as in every other view: Cancel a
+           clean document, or Discard unsaved header edits (the label flips on isDirty(), issue #7359). -->
+      <button x-h-button data-variant="transparent" @click="goBack()" :disabled="saving"
               x-text="isDirty() ? T('$projectName:${tprefix}.defaults.discard', 'Discard') : T('$projectName:${tprefix}.defaults.cancel', 'Cancel')"></button>
       <!-- Create a new header, then stay to add line items. -->
       <button x-h-button data-variant="primary" x-show="mode !== 'edit'#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="save()" :disabled="saving">
diff --git a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-view.html.template b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-view.html.template
index 6a30b7f0d46..b98f820be87 100644
--- a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-view.html.template
+++ b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-view.html.template
@@ -220,9 +220,9 @@
       <button x-h-button data-variant="negative" x-show="mode === 'edit'#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="deleteOpen = true"
               x-text="T('$projectName:${tprefix}.defaults.delete', 'Delete')"></button>
       <div class="flex-1"></div>
-      <!-- Cancel a new document, or discard unsaved header edits (issue #7359). Once a saved document
-           is clean there is nothing to discard, so this yields to Finish. -->
-      <button x-h-button data-variant="transparent" x-show="mode !== 'edit' || isDirty()" @click="goBack()" :disabled="saving"
+      <!-- Always an escape hatch, kept visible next to Create/Finish as in every other view: Cancel a
+           clean document, or Discard unsaved header edits (the label flips on isDirty(), issue #7359). -->
+      <button x-h-button data-variant="transparent" @click="goBack()" :disabled="saving"
               x-text="isDirty() ? T('$projectName:${tprefix}.defaults.discard', 'Discard') : T('$projectName:${tprefix}.defaults.cancel', 'Cancel')"></button>
       <!-- Create a new header, then stay to add line items. -->
       <button x-h-button data-variant="primary" x-show="mode !== 'edit'#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="save()" :disabled="saving">
diff --git a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-view.html.template b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-view.html.template
index c2d79f90778..9803df4e983 100644
--- a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-view.html.template
+++ b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-view.html.template
@@ -565,9 +565,9 @@
       <button type="button" x-h-button data-variant="primary" x-show="isPreview#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="goEdit()">
         <svg role="presentation" x-h-lucide data-lucide="pencil"></svg><span x-text="T('$projectName:${tprefix}.defaults.edit', 'Edit')"></span>
       </button>
-      <!-- Cancel a new document, or discard unsaved header edits (issue #7359). Once a saved document
-           is clean there is nothing to discard, so this yields to Finish below. -->
-      <button type="button" x-h-button data-variant="transparent" x-show="!isPreview &amp;&amp; (!isEdit || isDirty())" @click="backToList()" :disabled="state === 'saving'" x-text="isDirty() ? T('$projectName:${tprefix}.defaults.discard', 'Discard') : T('$projectName:${tprefix}.defaults.cancel', 'Cancel')"></button>
+      <!-- Always an escape hatch, kept visible next to Create/Finish as in every other view: Cancel a
+           clean document, or Discard unsaved header edits (the label flips on isDirty(), issue #7359). -->
+      <button type="button" x-h-button data-variant="transparent" x-show="!isPreview" @click="backToList()" :disabled="state === 'saving'" x-text="isDirty() ? T('$projectName:${tprefix}.defaults.discard', 'Discard') : T('$projectName:${tprefix}.defaults.cancel', 'Cancel')"></button>
       <!-- Create a new header, then STAY on the document (edit mode) so line items can be added. -->
       <button type="button" x-h-button data-variant="primary" x-show="!isPreview &amp;&amp; !isEdit" :disabled="state === 'saving'" @click="save()">
         <span x-show="state === 'saving'" x-h-spinner></span>

From 3403437503f9fa2c4269e80c532c848c331d5e26 Mon Sep 17 00:00:00 2001
From: Nikol Georgieva <nicole.georgieva18@abv.bg>
Date: Wed, 16 Sep 2026 00:33:23 +0300
Subject: [PATCH 3/5] ui: Finish only in the create flow; editing an existing
 document keeps Save (#7403)

Finish is the right primary while CREATING a document with line items (add the
header, then add items whose greyed Save was the original complaint), but wrong when
editing an existing one - there "Finish" reads as completing a creation that already
happened. Track whether the session began on the create route (createFlow, kept true
after the header save flips mode to 'edit'): the create flow shows Finish, an
existing document opened for editing shows the normal Save (updates the header, stays
on the page, disabled when nothing changed). Cancel/Discard stays always visible.
Power, my and partner document views + pages.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../ui/my/my-document-page.js.template              |  5 +++++
 .../ui/my/my-document-view.html.template            | 13 ++++++++++---
 .../ui/partner/partner-document-page.js.template    |  5 +++++
 .../ui/partner/partner-document-view.html.template  | 13 ++++++++++---
 .../perspective/document/document-page.js.template  |  5 +++++
 .../document/document-view.html.template            | 13 ++++++++++---
 6 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-page.js.template b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-page.js.template
index b7b74281269..ddd1462e940 100644
--- a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-page.js.template
+++ b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-page.js.template
@@ -20,6 +20,10 @@ document.addEventListener('alpine:init', () => {
     ...basePage(),
     state: 'loading',
     mode: 'create',
+    // True when this session began as a NEW document (create route); stays true after the header is
+    // saved and `mode` flips to 'edit', so the create flow shows Finish and an existing document opened
+    // for editing shows Save (issue #7403).
+    createFlow: false,
     id: null,
     error: null,
     // The single header property a rejected save NAMED ("The 'Name' property is required"), else
@@ -114,6 +118,7 @@ document.addEventListener('alpine:init', () => {
       const params = (window.PineconeRouter.context && window.PineconeRouter.context.params) || {};
       this.id = params.id || null;
       this.mode = this.id ? 'edit' : 'create';
+      this.createFlow = this.mode === 'create';
       if (this.id) {
         try {
           const record = await App.services.api.get(this.apiPath + '/' + this.id);
diff --git a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-view.html.template b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-view.html.template
index 14cc59a0339..2acc244c5bc 100644
--- a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-view.html.template
+++ b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-view.html.template
@@ -375,12 +375,19 @@
         <span x-show="saving" x-h-spinner></span>
         <span x-text="T('$projectName:${tprefix}.defaults.create', 'Create')"></span>
       </button>
-      <!-- Finish: line items save as you add them, so this saves any header change and returns to the
-           list - one honest primary action, never a greyed Save (issue #7403). -->
-      <button x-h-button data-variant="primary" x-show="mode === 'edit'#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="finish()" :disabled="saving">
+      <!-- Finish: ONLY while creating a new document (adding its line items after the header is saved).
+           Saves any header change and returns to the list - never a greyed Save on the new document
+           (issue #7403). -->
+      <button x-h-button data-variant="primary" x-show="mode === 'edit' &amp;&amp; createFlow#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="finish()" :disabled="saving">
         <span x-show="saving" x-h-spinner></span>
         <span x-text="T('$projectName:${tprefix}.defaults.finish', 'Finish')"></span>
       </button>
+      <!-- Save: editing an EXISTING document updates the header and stays on the page; disabled when
+           there is nothing to save. -->
+      <button x-h-button data-variant="primary" x-show="mode === 'edit' &amp;&amp; !createFlow#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="save()" :disabled="saving || !isDirty()">
+        <span x-show="saving" x-h-spinner></span>
+        <span x-text="T('$projectName:${tprefix}.defaults.update', 'Save')"></span>
+      </button>
 #end
     </div>
   </div>
diff --git a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-page.js.template b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-page.js.template
index 06b9ea07a98..454a085d79c 100644
--- a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-page.js.template
+++ b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-page.js.template
@@ -20,6 +20,10 @@ document.addEventListener('alpine:init', () => {
     ...basePage(),
     state: 'loading',
     mode: 'create',
+    // True when this session began as a NEW document (create route); stays true after the header is
+    // saved and `mode` flips to 'edit', so the create flow shows Finish and an existing document opened
+    // for editing shows Save (issue #7403).
+    createFlow: false,
     id: null,
     error: null,
     // The single header property a rejected save NAMED ("The 'Name' property is required"), else
@@ -105,6 +109,7 @@ document.addEventListener('alpine:init', () => {
       const params = (window.PineconeRouter.context && window.PineconeRouter.context.params) || {};
       this.id = params.id || null;
       this.mode = this.id ? 'edit' : 'create';
+      this.createFlow = this.mode === 'create';
       if (this.id) {
         try {
           const record = await App.services.api.get(this.apiPath + '/' + this.id);
diff --git a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-view.html.template b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-view.html.template
index b98f820be87..51e2b0b9696 100644
--- a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-view.html.template
+++ b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-view.html.template
@@ -229,12 +229,19 @@
         <span x-show="saving" x-h-spinner></span>
         <span x-text="T('$projectName:${tprefix}.defaults.create', 'Create')"></span>
       </button>
-      <!-- Finish: line items save as you add them, so this saves any header change and returns to the
-           list - one honest primary action, never a greyed Save (issue #7403). -->
-      <button x-h-button data-variant="primary" x-show="mode === 'edit'#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="finish()" :disabled="saving">
+      <!-- Finish: ONLY while creating a new document (adding its line items after the header is saved).
+           Saves any header change and returns to the list - never a greyed Save on the new document
+           (issue #7403). -->
+      <button x-h-button data-variant="primary" x-show="mode === 'edit' &amp;&amp; createFlow#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="finish()" :disabled="saving">
         <span x-show="saving" x-h-spinner></span>
         <span x-text="T('$projectName:${tprefix}.defaults.finish', 'Finish')"></span>
       </button>
+      <!-- Save: editing an EXISTING document updates the header and stays on the page; disabled when
+           there is nothing to save. -->
+      <button x-h-button data-variant="primary" x-show="mode === 'edit' &amp;&amp; !createFlow#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="save()" :disabled="saving || !isDirty()">
+        <span x-show="saving" x-h-spinner></span>
+        <span x-text="T('$projectName:${tprefix}.defaults.update', 'Save')"></span>
+      </button>
     </div>
   </div>
 
diff --git a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-page.js.template b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-page.js.template
index 07ff7304233..5efad5a8c1e 100644
--- a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-page.js.template
+++ b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-page.js.template
@@ -138,6 +138,10 @@ document.addEventListener('alpine:init', () => {
 
     state: 'ready',          // empty-form | loading | ready | saving | validation-error | save-failure | load-failure
     mode: 'create',
+    // True when this session began as a NEW document (create route). Stays true after the header is
+    // saved and `mode` flips to 'edit' for adding line items, so the create flow shows Finish while an
+    // existing document opened for editing shows Save (issue #7403).
+    createFlow: false,
     id: null,
     record: {},              // the loaded master (drives the read-only totals footer + calculated header fields)
 
@@ -337,6 +341,7 @@ document.addEventListener('alpine:init', () => {
       // Read the live hash to tell /preview from /edit (Pinecone's context can lag the hash).
       const routePath = (window.location.hash || '').split('?')[0];
       this.mode = this.id == null ? 'create' : (routePath.endsWith('/preview') ? 'preview' : 'edit');
+      this.createFlow = this.mode === 'create';
 
       // The line-items child registered itself as a detail of this master; pick it by name.
       this.itemsDef = App.detailsFor('${name}').find(d => d.entity === '${documentItemsEntity}') || null;
diff --git a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-view.html.template b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-view.html.template
index 9803df4e983..7b865a71003 100644
--- a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-view.html.template
+++ b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-view.html.template
@@ -573,12 +573,19 @@
         <span x-show="state === 'saving'" x-h-spinner></span>
         <svg x-h-lucide role="presentation" data-lucide="save" x-show="state !== 'saving'"></svg><span x-text="T('$projectName:${tprefix}.defaults.create', 'Create')"></span>
       </button>
-      <!-- Finish: line items are already saved as you add them, so this saves any header change and
-           returns to the list - one honest primary action, never a greyed Save (issue #7403). -->
-      <button type="button" x-h-button data-variant="primary" x-show="!isPreview &amp;&amp; isEdit" :disabled="state === 'saving'" @click="finish()">
+      <!-- Finish: ONLY while creating a new document (after its header is saved, its line items being
+           added). Line items save as you add them, so Finish saves any header change and returns to the
+           list - never a greyed Save on the new document (issue #7403). -->
+      <button type="button" x-h-button data-variant="primary" x-show="!isPreview &amp;&amp; isEdit &amp;&amp; createFlow" :disabled="state === 'saving'" @click="finish()">
         <span x-show="state === 'saving'" x-h-spinner></span>
         <svg x-h-lucide role="presentation" data-lucide="check" x-show="state !== 'saving'"></svg><span x-text="T('$projectName:${tprefix}.defaults.finish', 'Finish')"></span>
       </button>
+      <!-- Save: editing an EXISTING document updates the header and stays on the page (issue #7359);
+           disabled when there is nothing to save. -->
+      <button type="button" x-h-button data-variant="primary" x-show="!isPreview &amp;&amp; isEdit &amp;&amp; !createFlow" :disabled="state === 'saving' || !isDirty()" @click="save()">
+        <span x-show="state === 'saving'" x-h-spinner></span>
+        <svg x-h-lucide role="presentation" data-lucide="save" x-show="state !== 'saving'"></svg><span x-text="T('$projectName:${tprefix}.defaults.update', 'Save')"></span>
+      </button>
     </div>
     </div>
 

From a006f885bc809d6ec8eb6ad114c99fd61eb55039 Mon Sep 17 00:00:00 2001
From: Nikol Georgieva <nicole.georgieva18@abv.bg>
Date: Wed, 16 Sep 2026 00:47:17 +0300
Subject: [PATCH 4/5] ui: the document's edit-mode Save saves and returns to
 the list (#7403)

Editing an existing document showed Save, but it saved and stayed on the page (the
#7359 behaviour) and greyed out when nothing had changed - so after opening a saved
invoice there was no working primary that returned to the list. Point the edit-mode
Save at finish() (save any header change, then back to the list; a failed check keeps
the user on the page) and stop greying it. Create still stays on the document so line
items can be added; Finish (create flow) and Save (editing) now both save-and-return,
differing only in label. Power, my and partner document views.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../ui/my/my-document-view.html.template                   | 7 ++++---
 .../ui/partner/partner-document-view.html.template         | 7 ++++---
 .../ui/perspective/document/document-view.html.template    | 7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-view.html.template b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-view.html.template
index 2acc244c5bc..70f615aa26c 100644
--- a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-view.html.template
+++ b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/my/my-document-view.html.template
@@ -382,9 +382,10 @@
         <span x-show="saving" x-h-spinner></span>
         <span x-text="T('$projectName:${tprefix}.defaults.finish', 'Finish')"></span>
       </button>
-      <!-- Save: editing an EXISTING document updates the header and stays on the page; disabled when
-           there is nothing to save. -->
-      <button x-h-button data-variant="primary" x-show="mode === 'edit' &amp;&amp; !createFlow#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="save()" :disabled="saving || !isDirty()">
+      <!-- Save: editing an EXISTING document saves any header change and returns to the list (issue
+           #7403); line items already persist as they are added. Reuses finish() (save-if-changed,
+           then back), so a failed save keeps the user on the page. -->
+      <button x-h-button data-variant="primary" x-show="mode === 'edit' &amp;&amp; !createFlow#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="finish()" :disabled="saving">
         <span x-show="saving" x-h-spinner></span>
         <span x-text="T('$projectName:${tprefix}.defaults.update', 'Save')"></span>
       </button>
diff --git a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-view.html.template b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-view.html.template
index 51e2b0b9696..12a9779a6c1 100644
--- a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-view.html.template
+++ b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/partner/partner-document-view.html.template
@@ -236,9 +236,10 @@
         <span x-show="saving" x-h-spinner></span>
         <span x-text="T('$projectName:${tprefix}.defaults.finish', 'Finish')"></span>
       </button>
-      <!-- Save: editing an EXISTING document updates the header and stays on the page; disabled when
-           there is nothing to save. -->
-      <button x-h-button data-variant="primary" x-show="mode === 'edit' &amp;&amp; !createFlow#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="save()" :disabled="saving || !isDirty()">
+      <!-- Save: editing an EXISTING document saves any header change and returns to the list (issue
+           #7403); line items already persist as they are added. Reuses finish() (save-if-changed,
+           then back), so a failed save keeps the user on the page. -->
+      <button x-h-button data-variant="primary" x-show="mode === 'edit' &amp;&amp; !createFlow#if($immutableStatusProperty || $immutableAlways || $periodLock) &amp;&amp; mutable#end" @click="finish()" :disabled="saving">
         <span x-show="saving" x-h-spinner></span>
         <span x-text="T('$projectName:${tprefix}.defaults.update', 'Save')"></span>
       </button>
diff --git a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-view.html.template b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-view.html.template
index 7b865a71003..8752d727437 100644
--- a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-view.html.template
+++ b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-view.html.template
@@ -580,9 +580,10 @@
         <span x-show="state === 'saving'" x-h-spinner></span>
         <svg x-h-lucide role="presentation" data-lucide="check" x-show="state !== 'saving'"></svg><span x-text="T('$projectName:${tprefix}.defaults.finish', 'Finish')"></span>
       </button>
-      <!-- Save: editing an EXISTING document updates the header and stays on the page (issue #7359);
-           disabled when there is nothing to save. -->
-      <button type="button" x-h-button data-variant="primary" x-show="!isPreview &amp;&amp; isEdit &amp;&amp; !createFlow" :disabled="state === 'saving' || !isDirty()" @click="save()">
+      <!-- Save: editing an EXISTING document saves any header change and returns to the list (issue
+           #7403). Line items already persist as they are added, so this is the one primary exit; it
+           reuses finish() (save-if-changed, then back) so a failed check keeps the user on the page. -->
+      <button type="button" x-h-button data-variant="primary" x-show="!isPreview &amp;&amp; isEdit &amp;&amp; !createFlow" :disabled="state === 'saving'" @click="finish()">
         <span x-show="state === 'saving'" x-h-spinner></span>
         <svg x-h-lucide role="presentation" data-lucide="save" x-show="state !== 'saving'"></svg><span x-text="T('$projectName:${tprefix}.defaults.update', 'Save')"></span>
       </button>

From 2132e4ac46dad4c0c01af933976359746027bfb5 Mon Sep 17 00:00:00 2001
From: Nikol Georgieva <nicole.georgieva18@abv.bg>
Date: Wed, 16 Sep 2026 00:52:40 +0300
Subject: [PATCH 5/5] ui: Finish survives the create-flow navigation (power
 document view) (#7403)

The power Create button navigates to the /edit route, which re-mounts the page with
an id present, so createFlow re-computed to false and Finish never appeared - the
add-items phase looked identical to editing an existing document. Carry the signal
across the route change with a ?created=1 flag the Create navigation adds and init
reads, so the re-mounted /edit page still shows Finish while its line items are added;
reopening the document later from the list has no flag and shows Save. The my/partner
variants use a silent replaceState and were unaffected.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../ui/perspective/document/document-page.js.template     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-page.js.template b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-page.js.template
index 5efad5a8c1e..bfd906cb0d5 100644
--- a/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-page.js.template
+++ b/components/template/template-application-ui-harmonia-java/src/main/resources/META-INF/dirigible/template-application-ui-harmonia-java/ui/perspective/document/document-page.js.template
@@ -341,7 +341,9 @@ document.addEventListener('alpine:init', () => {
       // Read the live hash to tell /preview from /edit (Pinecone's context can lag the hash).
       const routePath = (window.location.hash || '').split('?')[0];
       this.mode = this.id == null ? 'create' : (routePath.endsWith('/preview') ? 'preview' : 'edit');
-      this.createFlow = this.mode === 'create';
+      // The create flow: either the /create route, or the /edit page the Create button just navigated to
+      // carrying ?created=1 (the header is saved, its line items are being added). Both show Finish.
+      this.createFlow = this.mode === 'create' || this.queryParam('created') === '1';
 
       // The line-items child registered itself as a detail of this master; pick it by name.
       this.itemsDef = App.detailsFor('${name}').find(d => d.entity === '${documentItemsEntity}') || null;
@@ -632,7 +634,9 @@ document.addEventListener('alpine:init', () => {
             // The write landed, so there is nothing left to protect: clear the guard before the page
             // navigates itself, or it would veto its own route change.
             this.clearPristine();
-            window.PineconeRouter.navigate('/${name}/' + encodeURIComponent(newId) + '/edit');
+            // ?created=1 marks this as the create flow across the route change, so the re-mounted page
+            // (now at /edit) still shows Finish while its line items are added, not Save (issue #7403).
+            window.PineconeRouter.navigate('/${name}/' + encodeURIComponent(newId) + '/edit?created=1');
             await this.loadHeader();
             await this.loadItems();
           }