A platform for community discussion. Free, open, simple.
UX: Add edit and delete actions to the workflows list (#44830)
David Battersby22a3a0d57a37
diff --git a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/index.gjs b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/index.gjsindex b3d134f3175..6385e3b1046 100644--- a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/index.gjs+++ b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/index.gjs@@ -5,6 +5,7 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";+import DMenu from "discourse/float-kit/components/d-menu";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import discourseDebounce from "discourse/lib/debounce";@@ -16,6 +17,7 @@ import DiscourseURL, {} from "discourse/lib/url";import { eq, not } from "discourse/truth-helpers";import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";import DFilterInput from "discourse/ui-kit/d-filter-input";import DMultiSelect from "discourse/ui-kit/d-multi-select";import DPageSubheader from "discourse/ui-kit/d-page-subheader";@@ -25,11 +27,13 @@ import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import dFormatDate from "discourse/ui-kit/helpers/d-format-date";import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";+import confirmDeleteWorkflow from "../../lib/workflows/confirm-delete-workflow.js";import AdminTable from "./admin-table.gjs";import EmptyState from "./empty-state.gjs";export default class WorkflowsIndex extends Component {@service currentUser;+ @service dialog;@service router;@service store;@@ -224,6 +228,29 @@ export default class WorkflowsIndex extends Component {}}+ @action+ async deleteWorkflow(workflow, closeMenu) {+ await closeMenu();++ await confirmDeleteWorkflow(this.dialog, workflow, {+ onDeleted: () => this.removeWorkflow(workflow),+ });+ }++ removeWorkflow(workflow) {+ const index = this.resultSet.content.indexOf(workflow);+ if (index === -1) {+ return;+ }++ this.resultSet.content.splice(index, 1);+ this.resultSet.totalRows -= 1;++ if (!this.hasActiveFilters) {+ this.hasWorkflows = this.resultSet.totalRows > 0;+ }+ }+@actionworkflowStatusLabel(workflow) {if (workflow.activeVersionId && workflow.hasUnpublishedChanges) {@@ -324,6 +351,7 @@ export default class WorkflowsIndex extends Component {<th class="d-table__header-cell">{{i18n"discourse_workflows.status"}}</th>+ <th class="d-table__header-cell"></th></:head><:row as |workflow|><td class="d-table__cell --overview workflows-index__name">@@ -406,6 +434,38 @@ export default class WorkflowsIndex extends Component {{{i18n (this.workflowStatusLabel workflow)}}</span></td>+ <td class="d-table__cell --controls">+ <div class="d-table__cell-actions">+ <LinkTo+ class="btn btn-default btn-text btn-small workflows-index__edit"+ @model={{workflow.id}}+ @route="adminPlugins.show.discourse-workflows.show"+ >+ {{i18n "discourse_workflows.edit"}}+ </LinkTo>++ <DMenu+ @icon="ellipsis-vertical"+ @identifier="workflows-index-menu"+ @placement="bottom-end"+ @title={{i18n "discourse_workflows.more_options"}}+ @triggerClass="btn-default btn-small workflows-index__menu-trigger"+ >+ <:content as |menu|>+ <DDropdownMenu as |dropdown|>+ <dropdown.item>+ <DButton+ class="btn-transparent --danger workflows-index__delete"+ @action={{fn this.deleteWorkflow workflow menu.close}}+ @icon="trash-can"+ @label="discourse_workflows.delete"+ />+ </dropdown.item>+ </DDropdownMenu>+ </:content>+ </DMenu>+ </div>+ </td></:row></AdminTable>{{else if this.hasActiveFilters}}diff --git a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/settings.gjs b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/settings.gjsindex f4b67339f56..64ea4e0e16d 100644--- a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/settings.gjs+++ b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/settings.gjs@@ -7,8 +7,8 @@ import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import TimezoneInput from "discourse/select-kit/components/timezone-input";import { i18n } from "discourse-i18n";+import confirmDeleteWorkflow from "../../lib/workflows/confirm-delete-workflow.js";import ErrorWorkflowChooser from "./error-workflow-chooser.js";-import InUseDialog from "./in-use-dialog.gjs";export default class WorkflowSettings extends Component {@service router;@@ -32,33 +32,9 @@ export default class WorkflowSettings extends Component {@actionasync deleteWorkflow() {- await this.dialog.deleteConfirm({- message: i18n("discourse_workflows.delete_confirm", {- name: this.args.workflow.name,- }),- didConfirm: async () => {- try {- await this.args.workflow.destroyRecord();- this.router.transitionTo(- "adminPlugins.show.discourse-workflows.index"- );- } catch (e) {- const body = e.jqXHR?.responseJSON;- if (body?.type === "workflow_called_by_other_workflows") {- this.dialog.alert({- title: i18n("discourse_workflows.in_use_title"),- bodyComponent: InUseDialog,- bodyComponentModel: {- description: i18n("discourse_workflows.in_use_description"),- workflows: body.referencing_workflows,- close: () => this.dialog.cancel(),- },- });- } else {- popupAjaxError(e);- }- }- },+ await confirmDeleteWorkflow(this.dialog, this.args.workflow, {+ onDeleted: () =>+ this.router.transitionTo("adminPlugins.show.discourse-workflows.index"),});}diff --git a/plugins/discourse-workflows/admin/assets/javascripts/admin/lib/workflows/confirm-delete-workflow.js b/plugins/discourse-workflows/admin/assets/javascripts/admin/lib/workflows/confirm-delete-workflow.jsnew file mode 100644index 00000000000..57c9c73ee58--- /dev/null+++ b/plugins/discourse-workflows/admin/assets/javascripts/admin/lib/workflows/confirm-delete-workflow.js@@ -0,0 +1,36 @@+import { popupAjaxError } from "discourse/lib/ajax-error";+import { i18n } from "discourse-i18n";+import InUseDialog from "../../components/workflows/in-use-dialog.gjs";++export default async function confirmDeleteWorkflow(+ dialog,+ workflow,+ { onDeleted }+) {+ await dialog.deleteConfirm({+ message: i18n("discourse_workflows.delete_confirm", {+ name: workflow.name,+ }),+ didConfirm: async () => {+ try {+ await workflow.destroyRecord();+ onDeleted(workflow);+ } catch (e) {+ const body = e.jqXHR?.responseJSON;+ if (body?.type === "workflow_called_by_other_workflows") {+ dialog.alert({+ title: i18n("discourse_workflows.in_use_title"),+ bodyComponent: InUseDialog,+ bodyComponentModel: {+ description: i18n("discourse_workflows.in_use_description"),+ workflows: body.referencing_workflows,+ close: () => dialog.cancel(),+ },+ });+ } else {+ popupAjaxError(e);+ }+ }+ },+ });+}diff --git a/plugins/discourse-workflows/spec/system/page_objects/pages/workflows.rb b/plugins/discourse-workflows/spec/system/page_objects/pages/workflows.rbindex 43f70e270d1..3bb24e49ecd 100644--- a/plugins/discourse-workflows/spec/system/page_objects/pages/workflows.rb+++ b/plugins/discourse-workflows/spec/system/page_objects/pages/workflows.rb@@ -77,6 +77,19 @@ module PageObjects).clickselfend++ def click_edit(workflow)+ find(".workflows-index__row[data-item-id='#{workflow.id}'] .workflows-index__edit").click+ self+ end++ def click_delete(workflow)+ find(+ ".workflows-index__row[data-item-id='#{workflow.id}'] .workflows-index__menu-trigger",+ ).click+ find(".workflows-index__delete").click+ self+ endendendenddiff --git a/plugins/discourse-workflows/spec/system/workflows_spec.rb b/plugins/discourse-workflows/spec/system/workflows_spec.rbindex 1eb21b7dc66..a922f777e17 100644--- a/plugins/discourse-workflows/spec/system/workflows_spec.rb+++ b/plugins/discourse-workflows/spec/system/workflows_spec.rb@@ -192,6 +192,29 @@ RSpec.describe "Discourse Workflows" doexpect(user_card).to be_showing_user(creator.username)end+ it "opens a workflow from the edit button" do+ workflow = Fabricate(:discourse_workflows_workflow, created_by: admin)++ workflows_page.visit_index+ workflows_page.click_edit(workflow)++ expect(page).to have_current_path("/admin/plugins/discourse-workflows/workflows/#{workflow.id}")+ end++ it "deletes a workflow from the row menu" do+ workflow = Fabricate(:discourse_workflows_workflow, name: "Doomed", created_by: admin)+ Fabricate(:discourse_workflows_workflow, name: "Survivor", created_by: admin)+ dialog = PageObjects::Components::Dialog.new++ workflows_page.visit_index+ workflows_page.click_delete(workflow)+ dialog.click_danger++ expect(workflows_page).to have_no_workflow("Doomed")+ expect(workflows_page).to have_workflow("Survivor")+ expect(DiscourseWorkflows::Workflow.exists?(workflow.id)).to eq(false)+ end+context "with workflow tags" dofab!(:ops_workflow) doFabricate(