A platform for community discussion. Free, open, simple.
FEATURE: Add a column menu to workflow data tables (#44598)
Régis Hanol8531095ebdce
diff --git a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/data-table/viewer.gjs b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/data-table/viewer.gjsindex 5caa1792076..369acf5b826 100644--- a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/data-table/viewer.gjs+++ b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/data-table/viewer.gjs@@ -5,11 +5,13 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import { modifier } from "ember-modifier";+import DMenu from "discourse/float-kit/components/d-menu";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { eq } from "discourse/truth-helpers";import DButton from "discourse/ui-kit/d-button";import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";import DLoadMore from "discourse/ui-kit/d-load-more";import { i18n } from "discourse-i18n";import AddColumnModal from "./add-column-modal";@@ -254,6 +256,35 @@ export default class DataTableViewer extends Component {this.editingColumnIndex = index;}+ @action+ async renameColumnFromMenu(index, closeMenu) {+ await closeMenu();+ this.editingColumnIndex = index;+ }++ @action+ async deleteColumn(column, closeMenu) {+ await closeMenu();+ this.dialog.deleteConfirm({+ message: i18n("discourse_workflows.data_tables.delete_column_confirm", {+ name: column.name,+ }),+ didConfirm: async () => {+ try {+ await ajax(`${this.apiBasePath}/columns/${column.name}.json`, {+ type: "DELETE",+ });+ this.dataTable = {+ ...this.dataTable,+ columns: this.dataTable.columns.filter((c) => c !== column),+ };+ } catch (e) {+ popupAjaxError(e);+ }+ },+ });+ }+@actionasync renameColumn(index, event) {this.editingColumnIndex = null;@@ -362,6 +393,40 @@ export default class DataTableViewer extends Component {{{on "click" (fn this.startEditingColumn index)}}>{{col.name}}</button>{{/if}}+ <DMenu+ @icon="ellipsis-vertical"+ @identifier="workflows-data-table-column-menu"+ @title={{i18n+ "discourse_workflows.data_tables.column_options"+ }}+ @triggerClass="btn-transparent btn-small workflows-data-table-viewer__col-menu"+ >+ <:content as |menu|>+ <DDropdownMenu as |dropdown|>+ <dropdown.item>+ <DButton+ class="btn-transparent"+ @action={{fn+ this.renameColumnFromMenu+ index+ menu.close+ }}+ @icon="pencil"+ @label="discourse_workflows.data_tables.rename_column"+ />+ </dropdown.item>+ <dropdown.divider />+ <dropdown.item>+ <DButton+ class="btn-transparent btn-danger"+ @action={{fn this.deleteColumn col menu.close}}+ @icon="trash-can"+ @label="discourse_workflows.data_tables.delete_column"+ />+ </dropdown.item>+ </DDropdownMenu>+ </:content>+ </DMenu></th>{{/each}}<thdiff --git a/plugins/discourse-workflows/assets/stylesheets/common/data-table/data-tables.scss b/plugins/discourse-workflows/assets/stylesheets/common/data-table/data-tables.scssindex fad86d215ba..8dc1cad0eb5 100644--- a/plugins/discourse-workflows/assets/stylesheets/common/data-table/data-tables.scss+++ b/plugins/discourse-workflows/assets/stylesheets/common/data-table/data-tables.scss@@ -132,6 +132,10 @@cursor: text;}+ &__col-menu {+ margin-left: var(--space-1);+ }+&__col-name-input {// stylelint-disable declaration-no-importantoutline: none !important;diff --git a/plugins/discourse-workflows/config/locales/client.en.yml b/plugins/discourse-workflows/config/locales/client.en.ymlindex 9eb31f57b9b..b48710dcae8 100644--- a/plugins/discourse-workflows/config/locales/client.en.yml+++ b/plugins/discourse-workflows/config/locales/client.en.yml@@ -1577,6 +1577,10 @@ en:boolean: "Boolean"date: "Date"add_column: "Add column"+ column_options: "Column options"+ rename_column: "Rename"+ delete_column: "Delete column"+ delete_column_confirm: "Are you sure you want to delete the “%{name}” column and all its data? Workflows using this column will fail on their next run."add_row: "Add row"edit_row: "Edit row"no_rows: "No rows yet"diff --git a/plugins/discourse-workflows/spec/system/data_tables_spec.rb b/plugins/discourse-workflows/spec/system/data_tables_spec.rbindex 16de7ce014d..cd3f31bfaf3 100644--- a/plugins/discourse-workflows/spec/system/data_tables_spec.rb+++ b/plugins/discourse-workflows/spec/system/data_tables_spec.rb@@ -35,4 +35,35 @@ RSpec.describe "Discourse Workflows - Data Tables" doexpect(data_tables_page).to have_row(count: 1)end++ describe "column menu" do+ fab!(:data_table) do+ Fabricate(+ :discourse_workflows_data_table,+ name: "contacts",+ columns: [+ { "name" => "email", "type" => "string" },+ { "name" => "score", "type" => "number" },+ ],+ )+ end++ let(:dialog) { PageObjects::Components::Dialog.new }++ it "renames a column" do+ data_tables_page.visit_show(data_table.id)+ data_tables_page.click_column_menu_item("email", "rename_column")+ data_tables_page.fill_column_name("contact_email")++ expect(data_tables_page).to have_column_names(%w[contact_email score])+ end++ it "deletes a column after confirmation" do+ data_tables_page.visit_show(data_table.id)+ data_tables_page.click_column_menu_item("email", "delete_column")+ dialog.click_danger++ expect(data_tables_page).to have_column_names(%w[score])+ end+ endenddiff --git a/plugins/discourse-workflows/spec/system/page_objects/pages/data_tables.rb b/plugins/discourse-workflows/spec/system/page_objects/pages/data_tables.rbindex a5ae041618a..c093bd33a99 100644--- a/plugins/discourse-workflows/spec/system/page_objects/pages/data_tables.rb+++ b/plugins/discourse-workflows/spec/system/page_objects/pages/data_tables.rb@@ -83,6 +83,32 @@ module PageObjectsfind(".workflows-data-table-viewer__add-row .btn-transparent").clickselfend++ def has_column_names?(names)+ page.has_css?(".workflows-data-table-viewer thead tr") do |header|+ header.all(".workflows-data-table-viewer__col-name").map(&:text) == names+ end+ end++ def click_column_menu_item(column_name, key)+ menu =+ PageObjects::Components::DMenu.new(+ find(".workflows-data-table-viewer__th", text: column_name).find(+ ".workflows-data-table-viewer__col-menu",+ ),+ "workflows-data-table-column-menu",+ )+ menu.expand+ within(menu.portal_with_identifier_selector) do+ find(".btn", text: I18n.t("js.discourse_workflows.data_tables.#{key}")).click+ end+ self+ end++ def fill_column_name(name)+ find(".workflows-data-table-viewer__col-name-input").fill_in(with: "#{name}\n")+ self+ endendendend