FIX: position was being incorrectly allocated to new step

app/controllers/discourse_workflow/admin/workflow_steps_controller.rb

@@ -42,7 +42,7 @@ def create
           if WorkflowStep.count == 0 || WorkflowStep.where(workflow_id: workflow_step.workflow_id).count == 0
             workflow_step.position = 1
           else
-            workflow_step.position = WorkflowStep.maximum(:position) + 1
+            workflow_step.position = WorkflowStep.where(workflow_id: workflow_step.workflow_id).maximum(:position).to_i + 1
           end
         end
         if workflow_step.save

assets/javascripts/discourse/admin/components/workflow-step-editor.gjs

@@ -60,7 +60,8 @@ export default class WorkflowStepEditor extends Component {
       });
       this.router.transitionTo(
         "adminPlugins.show.discourse-workflow-workflows.edit",
-        this.args.currentWorkflowStep.workflow_id
+        this.args.currentWorkflowStep.workflow_id,
+        { queryParams: { refresh: true } }
       );
     } catch (e) {
       this.args.currentWorkflowStep.setProperties(backupModel);
@@ -88,7 +89,8 @@ export default class WorkflowStepEditor extends Component {
           // this.args.currentWorkflowSteps.removeObject(this.args.currentWorkflowStep);
           this.router.transitionTo(
             "adminPlugins.show.discourse-workflow-workflows.edit",
-            this.args.currentWorkflowStep.workflow_id
+            this.args.currentWorkflowStep.workflow_id,
+            { queryParams: { refresh: true } }
           );
         });
       },

assets/javascripts/discourse/admin/routes/admin-plugins-show-discourse-workflow-workflows-edit.js

@@ -1,13 +1,13 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default class AdminPluginsShowDiscourseWorkflowWorkflowEdit extends DiscourseRoute {
+  queryParams = {
+    refresh: { refreshModel: true },
+  };
+
   async model(params) {
-    const allWorkflows = await this.modelFor(
-      "adminPlugins.show.discourse-workflow-workflows"
-    ).content;
     const id = parseInt(params.workflow_id, 10);
-    // return allWorkflows.find((workflow) => workflow.id === id);
-    return allWorkflows.findBy("id", id);
+    return this.store.find("workflow", id, { reload: true });
   }
 
   setupController(controller, model) {

assets/javascripts/discourse/admin/routes/admin-plugins-show-discourse-workflow-workflows-steps-new.js

@@ -6,13 +6,18 @@ export default class AdminPluginsShowDiscourseWorkflowWorkflowStepsNew extends D
     const workflow = this.modelFor(
       "adminPlugins.show.discourse-workflow-workflows-steps"
     );
+
+    const sortedSteps = [...workflow.workflow_steps].sort(
+      (a, b) => a.position - b.position
+    );
+
     // Create a new workflow step record
+    // Asign a default position to be the last existing step + 1
     const record = this.store.createRecord("workflow-step", {
       workflow_id: workflow.id,
       position:
-        workflow.workflow_steps.length > 0
-          ? workflow.workflow_steps[workflow.workflow_steps.length - 1]
-              .position + 1
+        sortedSteps.length > 0
+          ? sortedSteps[workflow.workflow_steps.length - 1].position + 1
           : 1,
     });
 

config/locales/client.en.yml

@@ -150,6 +150,7 @@ en:
                 next: "Next"
                 back: "Back"
                 finish: "Finish"
+                close: "Close"
                 reopen: "Reopen"
           back: "Back"
           save: "Save"

plugin.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # name: discourse-workflow
 # about: A topic-based workflow engine for Discourse
-# version: 0.0.12
+# version: 0.0.13
 # authors: Robert Barrow
 # contact_emails: robert@pavilion.tech
 # url: https://github.com/merefield/discourse-workflow