The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Transforms copy changes (#63760)
Alexander Polyankinb69218fe00c6
diff --git a/e2e/test/scenarios/admin/transforms.cy.spec.ts b/e2e/test/scenarios/admin/transforms.cy.spec.tsindex 88404f1ce67..c4948c0e47e 100644--- a/e2e/test/scenarios/admin/transforms.cy.spec.ts+++ b/e2e/test/scenarios/admin/transforms.cy.spec.ts@@ -1282,7 +1282,7 @@ H.describeWithSnowplowEE("scenarios > admin > transforms", () => {getNavSidebar().findByText("Runs").click();getContentTable().within(() => {- cy.findByText("In-progress").should("be.visible");+ cy.findByText("In progress").should("be.visible");cy.findByLabelText("Cancel run").click();});@@ -2036,7 +2036,7 @@ describe("scenarios > admin > transforms > runs", () => {cy.button("Update filter").click();});getRunMethodFilterWidget().findByText("Schedule").should("be.visible");- H.main().findByText("No runs yet").should("be.visible");+ H.main().findByText("No runs found").should("be.visible");cy.log("run method filter - multiple options");getRunMethodFilterWidget().click();@@ -2099,7 +2099,7 @@ describe("scenarios > admin > transforms > runs", () => {getStartAtFilterWidget().click();H.popover().findByText("Previous week").click();getStartAtFilterWidget().findByText("Previous week").should("be.visible");- H.main().findByText("No runs yet").should("be.visible");+ H.main().findByText("No runs found").should("be.visible");getStartAtFilterWidget().button("Remove filter").click();getContentTable().within(() => {@@ -2143,7 +2143,7 @@ describe("scenarios > admin > transforms > runs", () => {getEndAtFilterWidget().click();H.popover().findByText("Previous week").click();getEndAtFilterWidget().findByText("Previous week").should("be.visible");- H.main().findByText("No runs yet").should("be.visible");+ H.main().findByText("No runs found").should("be.visible");getEndAtFilterWidget().button("Remove filter").click();getContentTable().within(() => {@@ -2260,7 +2260,7 @@ function getTagFilterWidget() {}function getRunMethodFilterWidget() {- return cy.findByRole("group", { name: "Run method" });+ return cy.findByRole("group", { name: "Trigger" });}function getStartAtFilterWidget() {diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/TagSection/TagSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/TagSection/TagSection.tsxindex 83c503d9f15..342d3e981b2 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/TagSection/TagSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobView/TagSection/TagSection.tsx@@ -16,7 +16,7 @@ export function TagSection({ job, onTagsChange }: TagSectionProps) {return (<SplitSectionlabel={t`Tags to run`}- description={t`This job will run all transforms tagged with the tags you pick here.`}+ description={t`This job will run all transforms tagged with any of the tags you pick here.`}><Box p="xl"><TagMultiSelect tagIds={job.tag_ids ?? []} onChange={onTagsChange} />diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/DeleteTagModal/DeleteTagModal.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/DeleteTagModal/DeleteTagModal.tsxindex 06202afa35a..ee1b1207d42 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/DeleteTagModal/DeleteTagModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/DeleteTagModal/DeleteTagModal.tsx@@ -22,7 +22,12 @@ export function DeleteTagModal({onClose,}: DeleteTagModalProps) {return (- <Modal title={t`Delete this tag?`} opened padding="xl" onClose={onClose}>+ <Modal+ title={t`Delete the ${tag.name} tag?`}+ opened+ padding="xl"+ onClose={onClose}+ ><FocusTrap.InitialFocus /><DeleteTagForm tag={tag} onDelete={onDelete} onClose={onClose} /></Modal>diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/UpdateTagModal/UpdateTagModal.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/UpdateTagModal/UpdateTagModal.tsxindex 464a16c7e53..6bbd8b19a7f 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/UpdateTagModal/UpdateTagModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TagMultiSelect/UpdateTagModal/UpdateTagModal.tsx@@ -26,7 +26,12 @@ export function UpdateTagModal({onClose,}: UpdateTagModalProps) {return (- <Modal title={t`Rename tag`} opened padding="xl" onClose={onClose}>+ <Modal+ title={t`Rename the ${tag.name} tag`}+ opened+ padding="xl"+ onClose={onClose}+ ><FocusTrap.InitialFocus /><UpdateTagForm tag={tag} onUpdate={onUpdate} onClose={onClose} /></Modal>diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformTable/TransformTable.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformTable/TransformTable.module.cssindex 81b6f530d41..8b5eae235dd 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformTable/TransformTable.module.css+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformTable/TransformTable.module.css@@ -1,3 +1,7 @@.row {cursor: pointer;}++.wrap {+ overflow-wrap: anywhere;+}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformTable/TransformTable.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformTable/TransformTable.tsxindex a2f4f54b64c..6690dd3d092 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformTable/TransformTable.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TransformTable/TransformTable.tsx@@ -30,8 +30,8 @@ export function TransformTable({ transforms }: TransformTableProps) {className={S.row}onClick={() => handleRowClick(transform)}>- <td>{transform.name}</td>- <td>{transform.target.name}</td>+ <td className={S.wrap}>{transform.name}</td>+ <td className={S.wrap}>{transform.target.name}</td></tr>))}</AdminContentTable>diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsxindex b2f532c8dd5..2e49997ecc6 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx@@ -20,6 +20,7 @@ import { ListEmptyState } from "../../../components/ListEmptyState";import { TagList } from "../../../components/TagList";import { getJobUrl } from "../../../urls";import { parseTimestampWithTimezone } from "../../../utils";+import { hasFilterParams } from "../utils";import S from "./JobList.module.css";@@ -52,7 +53,10 @@ export function JobList({ params }: { params: JobListParams }) {}if (jobs.length === 0) {- return <ListEmptyState label={t`No jobs yet`} />;+ const hasFilters = hasFilterParams(params);+ return (+ <ListEmptyState label={hasFilters ? t`No jobs found` : t`No jobs yet`} />+ );}return (diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/utils.tsindex db64010e0b0..35308015709 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/utils.ts@@ -37,3 +37,11 @@ function parseList<T>(function parseNumber(value: unknown) {return typeof value === "string" ? parseInt(value, 10) : undefined;}++export function hasFilterParams(params: JobListParams) {+ return (+ params.lastRunStartTime != null ||+ params.nextRunStartTime != null ||+ params.transformTagIds != null+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformQueryPage/CreateTransformModal/CreateTransformModal.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformQueryPage/CreateTransformModal/CreateTransformModal.tsxindex f75d29ce4a6..e040f013a52 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformQueryPage/CreateTransformModal/CreateTransformModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformQueryPage/CreateTransformModal/CreateTransformModal.tsx@@ -132,7 +132,7 @@ function CreateTransformForm({<FormTextareaname="description"label={t`Description`}- placeholder={t`This is optional`}+ placeholder={t`This is optional, but helpful`}minRows={4}maxRows={10}/>@@ -146,7 +146,7 @@ function CreateTransformForm({<FormTextInputname="targetName"label={t`Table name`}- placeholder={t`some_name`}+ placeholder={t`descriptive_name`}/><Group><Box flex={1}>diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/FilterList/RunMethodFilterWidget/RunMethodFilterWidget.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/FilterList/RunMethodFilterWidget/RunMethodFilterWidget.tsxindex 354a5f982a6..3e26e826c20 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/FilterList/RunMethodFilterWidget/RunMethodFilterWidget.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/FilterList/RunMethodFilterWidget/RunMethodFilterWidget.tsx@@ -41,9 +41,9 @@ export function RunMethodFilterWidget({<Popover opened={isOpened} position="bottom-start" onDismiss={close}><Popover.Target><FilterFieldSet- label={t`Run method`}+ label={t`Trigger`}displayValue={getDisplayValue(runMethods)}- icon="calendar"+ icon="play"onClick={toggle}onRemove={handleRemove}/>diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsxindex a787bad34c8..fbac8095ce7 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx@@ -15,6 +15,7 @@ import type { RunListParams } from "../../../types";import { getRunListUrl, getTransformUrl } from "../../../urls";import { formatRunMethod, parseTimestampWithTimezone } from "../../../utils";import { PAGE_SIZE } from "../constants";+import { hasFilterParams } from "../utils";import S from "./RunList.module.css";@@ -29,7 +30,10 @@ export function RunList({ runs, totalCount, params }: RunListProps) {const hasPagination = totalCount > PAGE_SIZE;if (runs.length === 0) {- return <ListEmptyState label={t`No runs yet`} />;+ const hasFilters = hasFilterParams(params);+ return (+ <ListEmptyState label={hasFilters ? t`No runs found` : t`No runs yet`} />+ );}return (diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/utils.tsindex 8de9ad84b22..a0f7c7a584a 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/utils.ts@@ -72,3 +72,14 @@ function parseMethod(value: unknown): TransformRunMethod | undefined {}return undefined;}++export function hasFilterParams(params: RunListParams) {+ return (+ params.statuses != null ||+ params.transformIds != null ||+ params.transformTagIds != null ||+ params.startTime != null ||+ params.endTime != null ||+ params.runMethods != null+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/utils.tsindex 6f1a38d6465..28cce8088fb 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms/utils.ts@@ -26,7 +26,7 @@ export function parseTimestampWithTimezone(export function formatStatus(status: TransformRunStatus) {switch (status) {case "started":- return t`In-progress`;+ return t`In progress`;case "succeeded":return t`Success`;case "failed":