From 2ed1471dc103128d2193fd8ab42a3353091d95a3 Mon Sep 17 00:00:00 2001 From: Alan Greene Date: Mon, 14 Dec 2020 12:00:41 +0000 Subject: [PATCH] Update empty state strings for consistency and accuracy Update the strings displayed on empty tables to be more consistent across resource types and also to be more accurate. Since we've added label filtering support the 'no resources found' message has been a bit misleading, it should really be 'no matching resources found'. This is even more obvious with the recent addition of status filtering on the TaskRuns and PipelineRuns lists. Update the strings used for all namespaces, cluster resources, and selected namespace empty states. --- .../components/PipelineResources/PipelineResources.js | 5 +++-- .../PipelineResources/PipelineResources.test.js | 2 +- .../src/components/PipelineRuns/PipelineRuns.js | 5 +++-- .../src/components/PipelineRuns/PipelineRuns.test.js | 4 ++-- packages/components/src/components/Table/Table.test.js | 4 ---- .../components/src/components/TaskRuns/TaskRuns.js | 5 +++-- .../src/components/TaskRuns/TaskRuns.test.js | 2 +- src/components/CreateSecret/ServiceAccountSelector.js | 5 +++-- src/containers/ClusterTasks/ClusterTasks.js | 4 ++-- .../ClusterTriggerBindings/ClusterTriggerBindings.js | 4 ++-- .../ClusterTriggerBindings.test.js | 8 +++----- src/containers/Conditions/Conditions.js | 5 +++-- src/containers/EventListeners/EventListeners.js | 5 +++-- src/containers/EventListeners/EventListeners.test.js | 6 +++--- src/containers/Extensions/Extensions.js | 2 +- src/containers/Pipelines/Pipelines.js | 5 +++-- src/containers/ResourceList/ResourceList.js | 2 +- src/containers/Secrets/Secrets.js | 5 +++-- src/containers/ServiceAccounts/ServiceAccounts.js | 5 +++-- src/containers/ServiceAccounts/ServiceAccounts.test.js | 6 +++--- src/containers/Tasks/Tasks.js | 5 +++-- src/containers/TriggerBindings/TriggerBindings.js | 5 +++-- src/containers/TriggerBindings/TriggerBindings.test.js | 6 +++--- src/containers/TriggerTemplates/TriggerTemplates.js | 5 +++-- .../TriggerTemplates/TriggerTemplates.test.js | 6 +++--- src/nls/messages_en.json | 10 +++++----- 26 files changed, 66 insertions(+), 60 deletions(-) diff --git a/packages/components/src/components/PipelineResources/PipelineResources.js b/packages/components/src/components/PipelineResources/PipelineResources.js index 3394bb8cf..7f05e73aa 100644 --- a/packages/components/src/components/PipelineResources/PipelineResources.js +++ b/packages/components/src/components/PipelineResources/PipelineResources.js @@ -97,14 +97,15 @@ const PipelineResources = ({ emptyTextAllNamespaces={intl.formatMessage( { id: 'dashboard.emptyState.allNamespaces', - defaultMessage: 'No {kind} in any namespace.' + defaultMessage: 'No matching {kind} found' }, { kind: 'PipelineResources' } )} emptyTextSelectedNamespace={intl.formatMessage( { id: 'dashboard.emptyState.selectedNamespace', - defaultMessage: 'No {kind} in namespace {selectedNamespace}' + defaultMessage: + 'No matching {kind} found in namespace {selectedNamespace}' }, { kind: 'PipelineResources', selectedNamespace } )} diff --git a/packages/components/src/components/PipelineResources/PipelineResources.test.js b/packages/components/src/components/PipelineResources/PipelineResources.test.js index fa56dfa65..977ee0ca4 100644 --- a/packages/components/src/components/PipelineResources/PipelineResources.test.js +++ b/packages/components/src/components/PipelineResources/PipelineResources.test.js @@ -21,7 +21,7 @@ it('PipelineResources renders empty state', () => { const { queryByText } = renderWithIntl( ); - expect(queryByText(/no pipelineresources/i)).toBeTruthy(); + expect(queryByText(/no matching pipelineresources/i)).toBeTruthy(); expect(queryByText('Namespace')).toBeTruthy(); }); diff --git a/packages/components/src/components/PipelineRuns/PipelineRuns.js b/packages/components/src/components/PipelineRuns/PipelineRuns.js index dd2267cf9..4ed4c0d57 100644 --- a/packages/components/src/components/PipelineRuns/PipelineRuns.js +++ b/packages/components/src/components/PipelineRuns/PipelineRuns.js @@ -203,14 +203,15 @@ const PipelineRuns = ({ emptyTextAllNamespaces={intl.formatMessage( { id: 'dashboard.emptyState.allNamespaces', - defaultMessage: 'No {kind} in any namespace.' + defaultMessage: 'No matching {kind} found' }, { kind: 'PipelineRuns' } )} emptyTextSelectedNamespace={intl.formatMessage( { id: 'dashboard.emptyState.selectedNamespace', - defaultMessage: 'No {kind} in namespace {selectedNamespace}' + defaultMessage: + 'No matching {kind} found in namespace {selectedNamespace}' }, { kind: 'PipelineRuns', selectedNamespace } )} diff --git a/packages/components/src/components/PipelineRuns/PipelineRuns.test.js b/packages/components/src/components/PipelineRuns/PipelineRuns.test.js index bf9afbdfd..0a8f70a88 100644 --- a/packages/components/src/components/PipelineRuns/PipelineRuns.test.js +++ b/packages/components/src/components/PipelineRuns/PipelineRuns.test.js @@ -19,7 +19,7 @@ import PipelineRuns from './PipelineRuns'; describe('PipelineRuns', () => { it('renders empty state', () => { const { queryByText } = renderWithIntl(); - expect(queryByText(/no pipelineruns/i)).toBeTruthy(); + expect(queryByText(/no matching pipelineruns/i)).toBeTruthy(); expect(queryByText('Namespace')).toBeTruthy(); }); @@ -33,7 +33,7 @@ describe('PipelineRuns', () => { expect(queryByText('Namespace')).toBeFalsy(); expect(queryByText('Pipeline')).toBeTruthy(); - expect(queryByText(/no pipelineruns/i)).toBeTruthy(); + expect(queryByText(/no matching pipelineruns/i)).toBeTruthy(); }); it('renders custom columns', () => { diff --git a/packages/components/src/components/Table/Table.test.js b/packages/components/src/components/Table/Table.test.js index 719d0d8f8..0f2b76ab2 100644 --- a/packages/components/src/components/Table/Table.test.js +++ b/packages/components/src/components/Table/Table.test.js @@ -316,10 +316,6 @@ describe('Table', () => { expect(queryByText(/Add/i)).toBeNull(); expect(queryByLabelText('Select all rows')).toBeNull(); expect(queryByLabelText('Select row')).toBeNull(); - expect( - queryByText("No Resources created in namespace 'default'.") - ).toBeNull(); - expect(queryByText('No Resources created in any namespace.')).toBeNull(); }); it('batch action button specifies correct arguments for callback with one row selected', () => { diff --git a/packages/components/src/components/TaskRuns/TaskRuns.js b/packages/components/src/components/TaskRuns/TaskRuns.js index 88461c620..5386d9872 100644 --- a/packages/components/src/components/TaskRuns/TaskRuns.js +++ b/packages/components/src/components/TaskRuns/TaskRuns.js @@ -183,14 +183,15 @@ const TaskRuns = ({ emptyTextAllNamespaces={intl.formatMessage( { id: 'dashboard.emptyState.allNamespaces', - defaultMessage: 'No {kind} in any namespace.' + defaultMessage: 'No matching {kind} found' }, { kind: 'TaskRuns' } )} emptyTextSelectedNamespace={intl.formatMessage( { id: 'dashboard.emptyState.selectedNamespace', - defaultMessage: 'No {kind} in namespace {selectedNamespace}' + defaultMessage: + 'No matching {kind} found in namespace {selectedNamespace}' }, { kind: 'TaskRuns', selectedNamespace } )} diff --git a/packages/components/src/components/TaskRuns/TaskRuns.test.js b/packages/components/src/components/TaskRuns/TaskRuns.test.js index cae91fdaf..71afa46b9 100644 --- a/packages/components/src/components/TaskRuns/TaskRuns.test.js +++ b/packages/components/src/components/TaskRuns/TaskRuns.test.js @@ -18,7 +18,7 @@ import TaskRuns from './TaskRuns'; it('TaskRuns renders empty state', () => { const { queryByText } = renderWithIntl(); - expect(queryByText(/no taskruns/i)).toBeTruthy(); + expect(queryByText(/no matching taskruns/i)).toBeTruthy(); }); it('TaskRuns renders headers state', () => { diff --git a/src/components/CreateSecret/ServiceAccountSelector.js b/src/components/CreateSecret/ServiceAccountSelector.js index 179f67218..c6d4c923c 100644 --- a/src/components/CreateSecret/ServiceAccountSelector.js +++ b/src/components/CreateSecret/ServiceAccountSelector.js @@ -95,14 +95,15 @@ const ServiceAccountSelector = props => { emptyTextAllNamespaces={intl.formatMessage( { id: 'dashboard.emptyState.allNamespaces', - defaultMessage: 'No {kind} in any namespace.' + defaultMessage: 'No matching {kind} found' }, { kind: 'Secrets' } )} emptyTextSelectedNamespace={intl.formatMessage( { id: 'dashboard.emptyState.selectedNamespace', - defaultMessage: 'No {kind} in namespace {selectedNamespace}' + defaultMessage: + 'No matching {kind} found in namespace {selectedNamespace}' }, { kind: 'Secrets', selectedNamespace: namespace } )} diff --git a/src/containers/ClusterTasks/ClusterTasks.js b/src/containers/ClusterTasks/ClusterTasks.js index c99364e2c..04e3f944c 100644 --- a/src/containers/ClusterTasks/ClusterTasks.js +++ b/src/containers/ClusterTasks/ClusterTasks.js @@ -149,14 +149,14 @@ export /* istanbul ignore next */ class ClusterTasksContainer extends Component emptyTextAllNamespaces={intl.formatMessage( { id: 'dashboard.emptyState.clusterResource', - defaultMessage: 'No {kind}' + defaultMessage: 'No matching {kind} found' }, { kind: 'ClusterTasks' } )} emptyTextSelectedNamespace={intl.formatMessage( { id: 'dashboard.emptyState.clusterResource', - defaultMessage: 'No {kind}' + defaultMessage: 'No matching {kind} found' }, { kind: 'ClusterTasks' } )} diff --git a/src/containers/ClusterTriggerBindings/ClusterTriggerBindings.js b/src/containers/ClusterTriggerBindings/ClusterTriggerBindings.js index ffd6f9138..4b5589814 100644 --- a/src/containers/ClusterTriggerBindings/ClusterTriggerBindings.js +++ b/src/containers/ClusterTriggerBindings/ClusterTriggerBindings.js @@ -129,14 +129,14 @@ export /* istanbul ignore next */ class ClusterTriggerBindings extends Component emptyTextAllNamespaces={intl.formatMessage( { id: 'dashboard.emptyState.clusterResource', - defaultMessage: 'No {kind}' + defaultMessage: 'No matching {kind} found' }, { kind: 'ClusterTriggerBindings' } )} emptyTextSelectedNamespace={intl.formatMessage( { id: 'dashboard.emptyState.clusterResource', - defaultMessage: 'No {kind}' + defaultMessage: 'No matching {kind} found' }, { kind: 'ClusterTriggerBindings' } )} diff --git a/src/containers/ClusterTriggerBindings/ClusterTriggerBindings.test.js b/src/containers/ClusterTriggerBindings/ClusterTriggerBindings.test.js index 491a3e4e9..3497e612b 100644 --- a/src/containers/ClusterTriggerBindings/ClusterTriggerBindings.test.js +++ b/src/containers/ClusterTriggerBindings/ClusterTriggerBindings.test.js @@ -83,7 +83,7 @@ it('ClusterTriggerBindings renders with no bindings', () => { ); expect(getByText('ClusterTriggerBindings')).toBeTruthy(); - expect(getByText('No ClusterTriggerBindings')).toBeTruthy(); + expect(getByText('No matching ClusterTriggerBindings found')).toBeTruthy(); }); it('ClusterTriggerBindings renders with one binding', () => { @@ -112,7 +112,7 @@ it('ClusterTriggerBindings renders with one binding', () => { ); expect(queryByText('ClusterTriggerBindings')).toBeTruthy(); - expect(queryByText('No ClusterTriggerBindings')).toBeTruthy(); + expect(queryByText('No matching ClusterTriggerBindings found')).toBeTruthy(); expect(queryByText('cluster-trigger-binding')).toBeFalsy(); }); @@ -176,8 +176,6 @@ it('ClusterTriggerBindings renders in loading state', () => { ); expect(queryByText(/ClusterTriggerBindings/i)).toBeTruthy(); - expect( - queryByText('No ClusterTriggerBindings in any namespace.') - ).toBeFalsy(); + expect(queryByText('No matching ClusterTriggerBindings found')).toBeFalsy(); expect(queryByText('cluster-trigger-bindings')).toBeFalsy(); }); diff --git a/src/containers/Conditions/Conditions.js b/src/containers/Conditions/Conditions.js index 830b8a43c..009f1b900 100644 --- a/src/containers/Conditions/Conditions.js +++ b/src/containers/Conditions/Conditions.js @@ -140,14 +140,15 @@ export class Conditions extends Component { emptyTextAllNamespaces={intl.formatMessage( { id: 'dashboard.emptyState.allNamespaces', - defaultMessage: 'No {kind} in any namespace.' + defaultMessage: 'No matching {kind} found' }, { kind: 'Conditions' } )} emptyTextSelectedNamespace={intl.formatMessage( { id: 'dashboard.emptyState.selectedNamespace', - defaultMessage: 'No {kind} in namespace {selectedNamespace}' + defaultMessage: + 'No matching {kind} found in namespace {selectedNamespace}' }, { kind: 'Conditions', selectedNamespace } )} diff --git a/src/containers/EventListeners/EventListeners.js b/src/containers/EventListeners/EventListeners.js index 4e437681a..a7631d127 100644 --- a/src/containers/EventListeners/EventListeners.js +++ b/src/containers/EventListeners/EventListeners.js @@ -141,14 +141,15 @@ export /* istanbul ignore next */ class EventListeners extends Component { emptyTextAllNamespaces={intl.formatMessage( { id: 'dashboard.emptyState.allNamespaces', - defaultMessage: 'No {kind} in any namespace.' + defaultMessage: 'No matching {kind} found' }, { kind: 'EventListeners' } )} emptyTextSelectedNamespace={intl.formatMessage( { id: 'dashboard.emptyState.selectedNamespace', - defaultMessage: 'No {kind} in namespace {selectedNamespace}' + defaultMessage: + 'No matching {kind} found in namespace {selectedNamespace}' }, { kind: 'EventListeners', selectedNamespace } )} diff --git a/src/containers/EventListeners/EventListeners.test.js b/src/containers/EventListeners/EventListeners.test.js index 36eaa9145..6f3a5812d 100644 --- a/src/containers/EventListeners/EventListeners.test.js +++ b/src/containers/EventListeners/EventListeners.test.js @@ -83,7 +83,7 @@ it('EventListeners renders with no bindings', () => { ); expect(getByText('EventListeners')).toBeTruthy(); - expect(getByText('No EventListeners in any namespace.')).toBeTruthy(); + expect(getByText('No matching EventListeners found')).toBeTruthy(); }); it('EventListeners renders with one binding', () => { @@ -112,7 +112,7 @@ it('EventListeners renders with one binding', () => { ); expect(queryByText('EventListeners')).toBeTruthy(); - expect(queryByText('No EventListeners in any namespace.')).toBeFalsy(); + expect(queryByText('No matching EventListeners found')).toBeFalsy(); expect(queryByText('event-listener')).toBeTruthy(); expect(queryByTitle('event-listener')).toBeTruthy(); }); @@ -177,6 +177,6 @@ it('EventListeners renders in loading state', () => { ); expect(queryByText(/EventListeners/i)).toBeTruthy(); - expect(queryByText('No EventListeners in any namespace.')).toBeFalsy(); + expect(queryByText('No matching EventListeners found')).toBeFalsy(); expect(queryByText('event-listeners')).toBeFalsy(); }); diff --git a/src/containers/Extensions/Extensions.js b/src/containers/Extensions/Extensions.js index f4337dcb0..834ea30e6 100644 --- a/src/containers/Extensions/Extensions.js +++ b/src/containers/Extensions/Extensions.js @@ -59,7 +59,7 @@ export const Extensions = /* istanbul ignore next */ ({ const emptyText = intl.formatMessage({ id: 'dashboard.extensions.emptyState', - defaultMessage: 'No extensions' + defaultMessage: 'No extensions found' }); return ( diff --git a/src/containers/Pipelines/Pipelines.js b/src/containers/Pipelines/Pipelines.js index 91f5a6357..1ffb6a46c 100644 --- a/src/containers/Pipelines/Pipelines.js +++ b/src/containers/Pipelines/Pipelines.js @@ -163,14 +163,15 @@ export /* istanbul ignore next */ class Pipelines extends Component { emptyTextAllNamespaces={intl.formatMessage( { id: 'dashboard.emptyState.allNamespaces', - defaultMessage: 'No {kind} in any namespace.' + defaultMessage: 'No matching {kind} found' }, { kind: 'Pipelines' } )} emptyTextSelectedNamespace={intl.formatMessage( { id: 'dashboard.emptyState.selectedNamespace', - defaultMessage: 'No {kind} in namespace {selectedNamespace}' + defaultMessage: + 'No matching {kind} found in namespace {selectedNamespace}' }, { kind: 'Pipelines', selectedNamespace } )} diff --git a/src/containers/ResourceList/ResourceList.js b/src/containers/ResourceList/ResourceList.js index 229ccfcfb..3614a3911 100644 --- a/src/containers/ResourceList/ResourceList.js +++ b/src/containers/ResourceList/ResourceList.js @@ -123,7 +123,7 @@ export class ResourceListContainer extends Component { const emptyText = intl.formatMessage( { id: 'dashboard.resourceList.emptyState', - defaultMessage: 'No resources for type {type}.' + defaultMessage: 'No matching resources found for type {type}' }, { type } ); diff --git a/src/containers/Secrets/Secrets.js b/src/containers/Secrets/Secrets.js index 4a11ddcb5..f5775fd87 100644 --- a/src/containers/Secrets/Secrets.js +++ b/src/containers/Secrets/Secrets.js @@ -453,14 +453,15 @@ export /* istanbul ignore next */ class Secrets extends Component { emptyTextAllNamespaces={intl.formatMessage( { id: 'dashboard.emptyState.allNamespaces', - defaultMessage: 'No {kind} in any namespace.' + defaultMessage: 'No matching {kind} found' }, { kind: 'Secrets' } )} emptyTextSelectedNamespace={intl.formatMessage( { id: 'dashboard.emptyState.selectedNamespace', - defaultMessage: 'No {kind} in namespace {selectedNamespace}' + defaultMessage: + 'No matching {kind} found in namespace {selectedNamespace}' }, { kind: 'Secrets', selectedNamespace } )} diff --git a/src/containers/ServiceAccounts/ServiceAccounts.js b/src/containers/ServiceAccounts/ServiceAccounts.js index 88de9f70d..3b6dccc40 100644 --- a/src/containers/ServiceAccounts/ServiceAccounts.js +++ b/src/containers/ServiceAccounts/ServiceAccounts.js @@ -144,14 +144,15 @@ export /* istanbul ignore next */ class ServiceAccounts extends Component { emptyTextAllNamespaces={intl.formatMessage( { id: 'dashboard.emptyState.allNamespaces', - defaultMessage: 'No {kind} in any namespace.' + defaultMessage: 'No matching {kind} found' }, { kind: 'ServiceAccounts' } )} emptyTextSelectedNamespace={intl.formatMessage( { id: 'dashboard.emptyState.selectedNamespace', - defaultMessage: 'No {kind} in namespace {selectedNamespace}' + defaultMessage: + 'No matching {kind} found in namespace {selectedNamespace}' }, { kind: 'ServiceAccounts', selectedNamespace } )} diff --git a/src/containers/ServiceAccounts/ServiceAccounts.test.js b/src/containers/ServiceAccounts/ServiceAccounts.test.js index ab1cdd845..f95981625 100644 --- a/src/containers/ServiceAccounts/ServiceAccounts.test.js +++ b/src/containers/ServiceAccounts/ServiceAccounts.test.js @@ -82,7 +82,7 @@ it('ServiceAccounts renders with no bindings', () => { ); expect(getByText('ServiceAccounts')).toBeTruthy(); - expect(getByText('No ServiceAccounts in any namespace.')).toBeTruthy(); + expect(getByText('No matching ServiceAccounts found')).toBeTruthy(); }); it('ServiceAccounts renders with one binding', () => { @@ -111,7 +111,7 @@ it('ServiceAccounts renders with one binding', () => { ); expect(queryByText('ServiceAccounts')).toBeTruthy(); - expect(queryByText('No ServiceAccounts in any namespace.')).toBeFalsy(); + expect(queryByText('No matching ServiceAccounts found')).toBeFalsy(); expect(queryByText('foo-service-account')).toBeTruthy(); }); @@ -175,5 +175,5 @@ it('ServiceAccounts renders in loading state', () => { ); expect(queryByText(/ServiceAccounts/i)).toBeTruthy(); - expect(queryByText('No ServiceAccounts in any namespace.')).toBeFalsy(); + expect(queryByText('No matching ServiceAccounts found')).toBeFalsy(); }); diff --git a/src/containers/Tasks/Tasks.js b/src/containers/Tasks/Tasks.js index 1b006ac3e..77e13cd74 100644 --- a/src/containers/Tasks/Tasks.js +++ b/src/containers/Tasks/Tasks.js @@ -163,14 +163,15 @@ export /* istanbul ignore next */ class Tasks extends Component { emptyTextAllNamespaces={intl.formatMessage( { id: 'dashboard.emptyState.allNamespaces', - defaultMessage: 'No {kind} in any namespace.' + defaultMessage: 'No matching {kind} found' }, { kind: 'Tasks' } )} emptyTextSelectedNamespace={intl.formatMessage( { id: 'dashboard.emptyState.selectedNamespace', - defaultMessage: 'No {kind} in namespace {selectedNamespace}' + defaultMessage: + 'No matching {kind} found in namespace {selectedNamespace}' }, { kind: 'Tasks', selectedNamespace } )} diff --git a/src/containers/TriggerBindings/TriggerBindings.js b/src/containers/TriggerBindings/TriggerBindings.js index 0833394d4..25403c3c7 100644 --- a/src/containers/TriggerBindings/TriggerBindings.js +++ b/src/containers/TriggerBindings/TriggerBindings.js @@ -139,14 +139,15 @@ export /* istanbul ignore next */ class TriggerBindings extends Component { emptyTextAllNamespaces={intl.formatMessage( { id: 'dashboard.emptyState.allNamespaces', - defaultMessage: 'No {kind} in any namespace.' + defaultMessage: 'No matching {kind} found' }, { kind: 'TriggerBindings' } )} emptyTextSelectedNamespace={intl.formatMessage( { id: 'dashboard.emptyState.selectedNamespace', - defaultMessage: 'No {kind} in namespace {selectedNamespace}' + defaultMessage: + 'No matching {kind} found in namespace {selectedNamespace}' }, { kind: 'TriggerBindings', selectedNamespace } )} diff --git a/src/containers/TriggerBindings/TriggerBindings.test.js b/src/containers/TriggerBindings/TriggerBindings.test.js index 914e3a132..921db0133 100644 --- a/src/containers/TriggerBindings/TriggerBindings.test.js +++ b/src/containers/TriggerBindings/TriggerBindings.test.js @@ -83,7 +83,7 @@ it('TriggerBindings renders with no bindings', () => { ); expect(getByText('TriggerBindings')).toBeTruthy(); - expect(getByText('No TriggerBindings in any namespace.')).toBeTruthy(); + expect(getByText('No matching TriggerBindings found')).toBeTruthy(); }); it('TriggerBindings renders with one binding', () => { @@ -112,7 +112,7 @@ it('TriggerBindings renders with one binding', () => { ); expect(queryByText('TriggerBindings')).toBeTruthy(); - expect(queryByText('No TriggerBindings in any namespace.')).toBeFalsy(); + expect(queryByText('No matching TriggerBindings found')).toBeFalsy(); expect(queryByText('trigger-binding')).toBeTruthy(); }); @@ -176,6 +176,6 @@ it('TriggerBindings renders in loading state', () => { ); expect(queryByText(/TriggerBindings/i)).toBeTruthy(); - expect(queryByText('No TriggerBindings in any namespace.')).toBeFalsy(); + expect(queryByText('No matching TriggerBindings found')).toBeFalsy(); expect(queryByText('trigger-bindings')).toBeFalsy(); }); diff --git a/src/containers/TriggerTemplates/TriggerTemplates.js b/src/containers/TriggerTemplates/TriggerTemplates.js index e237f637d..a9edf747d 100644 --- a/src/containers/TriggerTemplates/TriggerTemplates.js +++ b/src/containers/TriggerTemplates/TriggerTemplates.js @@ -141,14 +141,15 @@ export /* istanbul ignore next */ class TriggerTemplates extends Component { emptyTextAllNamespaces={intl.formatMessage( { id: 'dashboard.emptyState.allNamespaces', - defaultMessage: 'No {kind} in any namespace.' + defaultMessage: 'No matching {kind} found' }, { kind: 'TriggerTemplates' } )} emptyTextSelectedNamespace={intl.formatMessage( { id: 'dashboard.emptyState.selectedNamespace', - defaultMessage: 'No {kind} in namespace {selectedNamespace}' + defaultMessage: + 'No matching {kind} found in namespace {selectedNamespace}' }, { kind: 'TriggerTemplates', selectedNamespace } )} diff --git a/src/containers/TriggerTemplates/TriggerTemplates.test.js b/src/containers/TriggerTemplates/TriggerTemplates.test.js index 29e092aff..e86c241a4 100644 --- a/src/containers/TriggerTemplates/TriggerTemplates.test.js +++ b/src/containers/TriggerTemplates/TriggerTemplates.test.js @@ -83,7 +83,7 @@ it('TriggerTemplates renders with no templates', () => { ); expect(queryByText('TriggerTemplates')).toBeTruthy(); - expect(queryByText('No TriggerTemplates in any namespace.')).toBeTruthy(); + expect(queryByText('No matching TriggerTemplates found')).toBeTruthy(); }); it('TriggerTemplates renders with one template', () => { @@ -112,7 +112,7 @@ it('TriggerTemplates renders with one template', () => { ); expect(queryByText(/TriggerTemplates/i)).toBeTruthy(); - expect(queryByText('No TriggerTemplates in any namespace.')).toBeFalsy(); + expect(queryByText('No matching TriggerTemplates found')).toBeFalsy(); expect(queryByText('trigger-template')).toBeTruthy(); }); @@ -176,5 +176,5 @@ it('TriggerTemplates renders in loading state', () => { ); expect(queryByText(/TriggerTemplates/i)).toBeTruthy(); - expect(queryByText('No TriggerTemplates in any namespace.')).toBeFalsy(); + expect(queryByText('No matching TriggerTemplates found')).toBeFalsy(); }); diff --git a/src/nls/messages_en.json b/src/nls/messages_en.json index 82edc016c..b3616bed3 100644 --- a/src/nls/messages_en.json +++ b/src/nls/messages_en.json @@ -99,16 +99,16 @@ "dashboard.deletePipelineRun.heading": "Delete PipelineRun", "dashboard.deleteTaskRun.body": "Are you sure you would like to delete TaskRun {name}?", "dashboard.deleteTaskRun.heading": "Delete TaskRun", - "dashboard.emptyState.allNamespaces": "No {kind} in any namespace.", - "dashboard.emptyState.clusterResource": "No {kind}", - "dashboard.emptyState.selectedNamespace": "No {kind} in namespace {selectedNamespace}", + "dashboard.emptyState.allNamespaces": "No matching {kind} found", + "dashboard.emptyState.clusterResource": "No matching {kind} found", + "dashboard.emptyState.selectedNamespace": "No matching {kind} found in namespace {selectedNamespace}", "dashboard.error.title": "Error:", "dashboard.errorBoundary.defaultError": "Something went wrong", "dashboard.errorBoundary.pageError": "Error loading page", "dashboard.eventListener.serviceAccount": "ServiceAccount:", "dashboard.eventListener.serviceType": "Service Type:", "dashboard.extension.error": "Error loading extension", - "dashboard.extensions.emptyState": "No extensions", + "dashboard.extensions.emptyState": "No extensions found", "dashboard.extensions.errorLoading": "Error loading extensions", "dashboard.extensions.title": "Extensions", "dashboard.filter.all": "All", @@ -209,7 +209,7 @@ "dashboard.resourceDetails.ariaLabel": "Resource details", "dashboard.resourceDetails.description": "Description", "dashboard.resourceDetails.errorloading": "Error loading resource", - "dashboard.resourceList.emptyState": "No resources for type {type}.", + "dashboard.resourceList.emptyState": "No matching resources found for type {type}", "dashboard.resourceList.errorLoading": "Error loading {type}", "dashboard.resourceList.viewDetails": "View {resource}", "dashboard.run.duration": "Duration: {duration}",