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.
tektoncd · Dec 15, 2020 · 2ed1471 · 2ed1471
1 parent dbffe8c
commit 2ed1471
Show file tree

Hide file tree

Showing 26 changed files with 66 additions and 60 deletions.
diff --git 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
@@ -21,7 +21,7 @@ it('PipelineResources renders empty state', () => {
   const { queryByText } = renderWithIntl(
     <PipelineResources pipelineResources={[]} />
   );
-  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
@@ -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
@@ -19,7 +19,7 @@ import PipelineRuns from './PipelineRuns';
 describe('PipelineRuns', () => {
   it('renders empty state', () => {
     const { queryByText } = renderWithIntl(<PipelineRuns pipelineRuns={[]} />);
-    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
@@ -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
@@ -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
@@ -18,7 +18,7 @@ import TaskRuns from './TaskRuns';
 
 it('TaskRuns renders empty state', () => {
   const { queryByText } = renderWithIntl(<TaskRuns taskRuns={[]} />);
-  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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 }
           )}